Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake Updates, main branch (2024.11.09.) #766

Merged
merged 4 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ add_subdirectory( plugins )

if ( TRACCC_BUILD_EXAMPLES )
# Find Boost.
find_package( Boost REQUIRED COMPONENTS program_options filesystem)
find_package( Boost CONFIG REQUIRED COMPONENTS program_options filesystem )
if ( NOT TRACCC_BUILD_IO )
message(FATAL_ERROR "traccc::io is disabled, but it is required to build the examples.")
endif()
Expand All @@ -402,7 +402,7 @@ endif()
# Set up the benchmark(s).
if( TRACCC_BUILD_BENCHMARKS )
# Find Boost.
find_package( Boost REQUIRED COMPONENTS filesystem)
find_package( Boost CONFIG REQUIRED COMPONENTS filesystem )
if ( NOT TRACCC_BUILD_IO )
message(FATAL_ERROR "traccc::io is disabled, but it is required to build the tests.")
endif()
Expand Down
6 changes: 0 additions & 6 deletions extern/algebra-plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,9 @@ set( ALGEBRA_PLUGINS_BUILD_TESTING FALSE CACHE BOOL
"Turn off the build of the Algebra Plugins unit tests" )
set( ALGEBRA_PLUGINS_INCLUDE_EIGEN TRUE CACHE BOOL
"Turn on the build of algebra::eigen" )
set( ALGEBRA_PLUGINS_INCLUDE_VC TRUE CACHE BOOL
"Turn on the build of algebra::vc_array" )
set( ALGEBRA_PLUGINS_INCLUDE_VECMEM TRUE CACHE BOOL
"Turn on the build of algebra::vecmem_array" )

set( ALGEBRA_PLUGINS_SETUP_VC TRUE CACHE BOOL
"Have Algebra Plugins set up Vc for itself" )
set( ALGEBRA_PLUGINS_USE_SYSTEM_VC FALSE CACHE BOOL
"Have Algebra Plugins build Vc itself" )
set( ALGEBRA_PLUGINS_SETUP_EIGEN3 FALSE CACHE BOOL
"Do not set up Eigen4=3 in Algebra Plugins" )
set( ALGEBRA_PLUGINS_SETUP_VECMEM FALSE CACHE BOOL
Expand Down
2 changes: 2 additions & 0 deletions extern/benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ mark_as_advanced( TRACCC_BENCHMARK_SOURCE_FULL )
FetchContent_Declare(Benchmark ${TRACCC_BENCHMARK_SOURCE_FULL})

# Options used in the build of Google Benchmark.
set(BUILD_SHARED_LIBS FALSE)
paulgessinger marked this conversation as resolved.
Show resolved Hide resolved
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Turn off the tests in Google Benchmark")
set(BENCHMARK_ENABLE_WERROR OFF CACHE BOOL "Turn off the -Werror for Release build")
set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Do not install Google Benchmark")

# Get it into the current directory.
FetchContent_MakeAvailable(Benchmark)
Expand Down
2 changes: 0 additions & 2 deletions extern/detray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ set( DETRAY_BUILD_TUTORIALS FALSE CACHE BOOL
"Turn off the build of the Detray tutorials" )
set( DETRAY_EIGEN_PLUGIN TRUE CACHE BOOL
"Turn on the build of the Detray Eigen code" )
set( DETRAY_VC_AOS_PLUGIN TRUE CACHE BOOL
"Turn on the build of the Detray Vc AoS code" )

# Needed for 'performance', 'simulation', 'examples', 'tests' and 'benchmarks'
if( TRACCC_BUILD_IO OR TRACCC_BUILD_EXAMPLES OR (BUILD_TESTING AND TRACCC_BUILD_TESTING) OR TRACCC_BUILD_BENCHMARKS )
Expand Down
4 changes: 1 addition & 3 deletions extern/googletest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ endif()
set( CMAKE_MACOSX_RPATH TRUE )

# Get it into the current directory.
FetchContent_Populate( GoogleTest )
add_subdirectory( "${googletest_SOURCE_DIR}" "${googletest_BINARY_DIR}"
EXCLUDE_FROM_ALL )
FetchContent_MakeAvailable( GoogleTest )

# Set up aliases for the GTest targets with the same name that they have
# when we find GTest pre-installed.
Expand Down
Loading