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

build: Remove extra minimum cmake versions, set policies #3398

Merged
merged 2 commits into from
Jul 23, 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
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,17 @@ set(_acts_boost_recommended_version 1.78.0)
# Include the sources for the external dependencies.
include(ActsExternSources)

# Controls behavior of DOWNLOAD_EXTRACT_TIMESTAMP
if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
endif()

# required packages
if (ACTS_SETUP_BOOST)
if (ACTS_USE_SYSTEM_BOOST)
# NOTE FindBoost.cmake looks for BoostConfig.cmake first, before running it's own logic.
if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
endif()

# Enable both program_options and unit_test_framework to reduce complexity
# Also Cuda tests seem to use program_options
Expand Down
1 change: 0 additions & 1 deletion cmake/FindFilesystem.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ if(TARGET std::filesystem)
return()
endif()

cmake_minimum_required(VERSION 3.10)

include(CMakePushCheckState)
include(CheckIncludeFileCXX)
Expand Down
4 changes: 0 additions & 4 deletions thirdparty/FRNN/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.11)
include(FetchContent)

message(STATUS "Building FRNN as part of the ACTS project")
Expand All @@ -22,5 +20,3 @@ if(NOT frnncontent_POPULATED)
configure_file(CMakeLists.txt.in "${frnncontent_SOURCE_DIR}/CMakeLists.txt" COPYONLY)
add_subdirectory(${frnncontent_SOURCE_DIR} ${frnncontent_BINARY_DIR})
endif()


1 change: 0 additions & 1 deletion thirdparty/GeoModel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# CMake include(s).
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
Expand Down
1 change: 0 additions & 1 deletion thirdparty/actsvg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# CMake include(s).
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
Expand Down
3 changes: 1 addition & 2 deletions thirdparty/algebra-plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# CMake include(s).
cmake_minimum_required(VERSION 3.14)
include(FetchContent)

# Tell the user what's happening.
Expand Down Expand Up @@ -44,4 +43,4 @@ set(ALGEBRA_PLUGINS_SETUP_GOOGLETEST FALSE CACHE BOOL
set(ALGEBRA_PLUGINS_SETUP_BENCHMARK FALSE CACHE BOOL "Do not setup Algebra Plugins benchmark")

# Now set up its build.
FetchContent_MakeAvailable( AlgebraPlugins )
FetchContent_MakeAvailable( AlgebraPlugins )
3 changes: 1 addition & 2 deletions thirdparty/covfie/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# CMake include(s).
cmake_minimum_required(VERSION 3.14)
include(FetchContent)

# Tell the user what's happening.
Expand All @@ -30,4 +29,4 @@ set( COVFIE_REQUIRE_CXX20 OFF CACHE BOOL "Enable covfie C++20 requirement")
set( COVFIE_QUIET ON CACHE BOOL "Quiet covfie feature warnings")

# Now set up its build.
FetchContent_MakeAvailable( covfie )
FetchContent_MakeAvailable( covfie )
3 changes: 1 addition & 2 deletions thirdparty/detray/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# CMake include(s).
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
Expand Down Expand Up @@ -56,4 +55,4 @@ set( DETRAY_SETUP_DFELIBS OFF CACHE BOOL


#Now set up its build.
FetchContent_MakeAvailable(Detray)
FetchContent_MakeAvailable(Detray)
1 change: 0 additions & 1 deletion thirdparty/dfelibs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
Expand Down
5 changes: 0 additions & 5 deletions thirdparty/nlohmann_json/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
message( STATUS "Building nlohmann_json as part of the ACTS project" )

if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW)
endif()

# Declare where to get nlohmann json from.
FetchContent_Declare( nlohmann_json ${ACTS_NLOHMANNJSON_SOURCE} )

Expand Down
1 change: 0 additions & 1 deletion thirdparty/pybind11/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
Expand Down
3 changes: 1 addition & 2 deletions thirdparty/vecmem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

# CMake include(s).
cmake_minimum_required( VERSION 3.11 )
include( FetchContent )

# Tell the user what's happening.
Expand All @@ -22,7 +21,7 @@ FetchContent_Declare( VecMem ${ACTS_VECMEM_SOURCE} )
set( VECMEM_BUILD_TESTING FALSE CACHE BOOL
"Turn off the build of the VecMem unit tests" )
set( VECMEM_BUILD_BENCHMARKING FALSE CACHE BOOL
"Turn off the build of VecMem benchmarking" )
"Turn off the build of VecMem benchmarking" )

# Now set up its build.
FetchContent_MakeAvailable( VecMem )
Loading