diff --git a/CMakeLists.txt b/CMakeLists.txt index c2bdb2ca625d7ae6b92c1a3c0bbcb196a89c66ec..258161b09a4d27113ea82e519a939df0be8ca23f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,4 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR) -if (POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) # CMake 3.12 -endif () PROJECT( DD4hep LANGUAGES NONE) SET_PROPERTY(DIRECTORY . PROPERTY PACKAGE_NAME DD4hep) diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake index d0d70e20597699e51035eb0bd6d2d35384df95a8..4c45218edad8f36f55279c466d356d94bf62b735 100644 --- a/cmake/DD4hep.cmake +++ b/cmake/DD4hep.cmake @@ -10,10 +10,6 @@ # #================================================================================= -if (POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) # CMake 3.12 -endif () - #--------------------------------------------------------------------------------------------------- if ( DD4hep_DIR ) set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DD4hep_DIR}/cmake ) diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt index 98f7286d521fd8b1e7b951893f7fce7e82ae7a03..dea7ae9a35237988907d8057d235d79a082bfecc 100644 --- a/examples/AlignDet/CMakeLists.txt +++ b/examples/AlignDet/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #-------------------------------------------------------------------------- diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt index 602e038ed0b4b1fc6010babcbd5b69b846f537be..fa04537161fc3278a56080cd6f3b0387d1ba31d0 100644 --- a/examples/CLICSiD/CMakeLists.txt +++ b/examples/CLICSiD/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #----------------------------------------------------------------------------------- diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 9e6da72e55ee6d484961e903bc5157048b8a4437..7d66b0f2b452b488cdd63a2b8dee7a5c515c6797 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -21,10 +21,7 @@ # # M.Frank, CERN, 2015: Adapt to new cmake scripts #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) -if (POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) # CMake 3.12 -endif () +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) project( DD4hep_Examples ) diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt index 882e64fbf89b37c6d8d9007808bc3c9858017d60..f0f9ee9018e941ec03ed07403d2192edc57aec96 100644 --- a/examples/ClientTests/CMakeLists.txt +++ b/examples/ClientTests/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #-------------------------------------------------------------------------- diff --git a/examples/Conditions/CMakeLists.txt b/examples/Conditions/CMakeLists.txt index 1ac8290faba3dc18970370f468ca16087cf9ad81..9eaedd0afb392ca774c060d209e4005b6a9b0977 100644 --- a/examples/Conditions/CMakeLists.txt +++ b/examples/Conditions/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #-------------------------------------------------------------------------- diff --git a/examples/DDCMS/CMakeLists.txt b/examples/DDCMS/CMakeLists.txt index 4532099392dffb12f765cade13ca06dad687df87..8aad0fee225eb611ee8e51292e6aba410f5f1c2b 100644 --- a/examples/DDCMS/CMakeLists.txt +++ b/examples/DDCMS/CMakeLists.txt @@ -12,7 +12,7 @@ # DDCMS is a detector description convention developed by the CMS experiment. # #================================================================================= -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #------------------------------------------------------------------------------ diff --git a/examples/DDCodex/CMakeLists.txt b/examples/DDCodex/CMakeLists.txt index 2fd8ab8ffa46f23dcbb93294664307b73729d553..a3e13c4f308a268f54984cec66243e473e159ee1 100755 --- a/examples/DDCodex/CMakeLists.txt +++ b/examples/DDCodex/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #---DDCodex plugin library ------------------------------------------------------- diff --git a/examples/DDDB/CMakeLists.txt b/examples/DDDB/CMakeLists.txt index 68fd85e7b7d79df7d6b76ff151efb89273e71600..0d22ebc40992bdef17c7898c45330b104d5e891b 100644 --- a/examples/DDDB/CMakeLists.txt +++ b/examples/DDDB/CMakeLists.txt @@ -17,7 +17,7 @@ # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) # XercesC dependent stuff if(DD4HEP_USE_XERCESC) diff --git a/examples/DDDigi/CMakeLists.txt b/examples/DDDigi/CMakeLists.txt index a313599cce99939495c35e4afbc23c99596b93dd..e1e6b3256cb88bf721519e2d5d9d8d75888461ba 100644 --- a/examples/DDDigi/CMakeLists.txt +++ b/examples/DDDigi/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #----------------------------------------------------------------------------------- diff --git a/examples/DDG4/CMakeLists.txt b/examples/DDG4/CMakeLists.txt index a9297b1f4e3143e4d3202badfd4e0d1075c534a3..29d0cb307e8300f5730b5981212f95fd2981f54f 100644 --- a/examples/DDG4/CMakeLists.txt +++ b/examples/DDG4/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #----------------------------------------------------------------------------------- diff --git a/examples/DDG4_MySensDet/CMakeLists.txt b/examples/DDG4_MySensDet/CMakeLists.txt index 51888b8aa9f5d2375e75ef22ecbd1aed82679242..2cdfe886d8e1c07cf47ee9bd05e7049c45cf4a4d 100644 --- a/examples/DDG4_MySensDet/CMakeLists.txt +++ b/examples/DDG4_MySensDet/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) if(NOT TARGET Geant4::Interface) diff --git a/examples/LHeD/CMakeLists.txt b/examples/LHeD/CMakeLists.txt index 4fb8552a8ccec4c37490f0cc01355ea8819a2d7d..38635703d33751ca5c6220a8a407f0162213b1cd 100644 --- a/examples/LHeD/CMakeLists.txt +++ b/examples/LHeD/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # CLICSiD used as template! #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #----------------------------------------------------------------------------------- diff --git a/examples/OpticalSurfaces/CMakeLists.txt b/examples/OpticalSurfaces/CMakeLists.txt index e92ae0a074de442f4a6f77b5c52ad791956e3e40..fb0b7398865ca68643ecf8730d8837ce175735c9 100644 --- a/examples/OpticalSurfaces/CMakeLists.txt +++ b/examples/OpticalSurfaces/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) dd4hep_print("|++> OpticalSurfaces: ROOT version: ${ROOT_VERSION}") diff --git a/examples/Persistency/CMakeLists.txt b/examples/Persistency/CMakeLists.txt index 5eda33742564296d4e661ec55142b646229db245..1e6642dcc65e6ee0ee7199a6b1b5e077466d59f4 100644 --- a/examples/Persistency/CMakeLists.txt +++ b/examples/Persistency/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) if(TARGET XercesC::XercesC) diff --git a/examples/Segmentation/CMakeLists.txt b/examples/Segmentation/CMakeLists.txt index f42e789ea809453336361030a364322f4572ff95..a08977a668bb9f7c17591f087167ba59da2b1031 100644 --- a/examples/Segmentation/CMakeLists.txt +++ b/examples/Segmentation/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) #--------------------------- set( PackageName Segmentation ) diff --git a/examples/SimpleDetector/CMakeLists.txt b/examples/SimpleDetector/CMakeLists.txt index 8214d2ecb0b89940d8e57ab80333375e7b7d5255..3b9ee7dee4bd4b652f639eef5734567544578240 100644 --- a/examples/SimpleDetector/CMakeLists.txt +++ b/examples/SimpleDetector/CMakeLists.txt @@ -8,7 +8,7 @@ # For the list of contributors see $DD4hepINSTALL/doc/CREDITS. # #========================================================================== -cmake_minimum_required(VERSION 3.3 FATAL_ERROR) +cmake_minimum_required(VERSION 3.12 FATAL_ERROR) include ( ${DD4hep_DIR}/cmake/DD4hep.cmake ) #-----------------------------------------------------------------------------------