Revert CMake changes (#4707)

This was likely put back when #4292 was rebased.
This commit is contained in:
Michael Legleux
2023-09-15 08:44:44 -07:00
committed by Elliot Lee
parent 5b7d2c133a
commit 01fc4b0203
2 changed files with 2 additions and 10 deletions

View File

@@ -18,10 +18,8 @@ macro(group_sources curdir)
endmacro() endmacro()
macro (exclude_from_default target_) macro (exclude_from_default target_)
if(target_) set_target_properties (${target_} PROPERTIES EXCLUDE_FROM_ALL ON)
set_target_properties (${target_} PROPERTIES EXCLUDE_FROM_ALL ON) set_target_properties (${target_} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD ON)
set_target_properties (${target_} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD ON)
endif()
endmacro () endmacro ()
macro (exclude_if_included target_) macro (exclude_if_included target_)

View File

@@ -2,12 +2,6 @@
package/container targets - (optional) package/container targets - (optional)
#]===================================================================] #]===================================================================]
# Early return if the `containers` directory is missing,
# e.g. when we are building a Conan package.
if(NOT EXISTS containers)
return()
endif()
if (is_root_project) if (is_root_project)
if (NOT DOCKER) if (NOT DOCKER)
find_program (DOCKER docker) find_program (DOCKER docker)