Skip to content

Commit

Permalink
Updated dependency build scripts
Browse files Browse the repository at this point in the history
* Use the inbuilt CMake "load_cache(...)" mechanism to transmit the superbuild configuration to dependencies
* This avoids the need to capture many CMake variables manually
  • Loading branch information
DavidAce committed May 31, 2021
1 parent 3d6e510 commit d2f9812
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions cmake/BuildDependency.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,11 @@ function(build_dependency dep_name install_dir extra_flags)
execute_process(
COMMAND ${CMAKE_COMMAND}
# CMake flags
-DCMAKE_POLICY_DEFAULT_CMP0074=NEW
-DCMAKE_EXE_LINKER_FLAGS_INIT=${CMAKE_EXE_LINKER_FLAGS}
-DCMAKE_SHARED_LINKER_FLAGS_INIT=${CMAKE_SHARED_LINKER_FLAGS}
-DCMAKE_STATIC_LINKER_FLAGS_INIT=${CMAKE_STATIC_LINKER_FLAGS}
-DCMAKE_MODULE_LINKER_FLAGS_INIT=${CMAKE_MODULE_LINKER_FLAGS}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=${CMAKE_POSITION_INDEPENDENT_CODE}
-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
-DSUPER_CACHEFILE_DIR=${CMAKE_CACHEFILE_DIR}
-DCMAKE_INSTALL_PREFIX:PATH=${install_dir}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=${CMAKE_CXX_STANDARD_REQUIRED}
-DCMAKE_CXX_EXTENSIONS:BOOL=${CMAKE_CXX_EXTENSIONS}
-DCMAKE_CXX_FLAGS_INIT:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_FLAGS_RELEASE_INIT:STRING=${CMAKE_CXX_FLAGS_RELEASE}
-DCMAKE_CXX_FLAGS_DEBUG_INIT:STRING=${CMAKE_CXX_FLAGS_DEBUG}
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-DCMAKE_CXX_FLAGS_MINSIZEREL_INIT:STRING=${CMAKE_CXX_FLAGS_MINSIZEREL}
-DCMAKE_INSTALL_MESSAGE=NEVER #Avoid unnecessary output to console
-DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-DCMAKE_INSTALL_PREFIX:PATH=${install_dir}
${extra_flags}
${PROJECT_SOURCE_DIR}/cmake/external_${dep_name}
WORKING_DIRECTORY ${build_dir}
Expand Down

0 comments on commit d2f9812

Please sign in to comment.