migrate --flags-only

lgarren · Feb 17, 2022 · 3cf150d · 3cf150d
1 parent e5f2129
commit 3cf150d
Show file tree

Hide file tree

Showing 10 changed files with 592 additions and 240 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,12 +6,13 @@
 #  buildtool [-I /install/path] -bt[i] -jN
 # ======================================================================
 
-cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
+# cmake_policy(VERSION 3.19) ### MIGRATE-ACTION-COMPATIBILITY (migrate-3.05.03) - Uncomment to preseve compatibility with older CMake versions
 
+find_package(cetmodules REQUIRED)
 project(larcorealg VERSION 09.05.00 LANGUAGES CXX)
 
 # cetbuildtools contains our cmake modules
-find_package(cetbuildtools REQUIRED)
 
 include(CetCMakeEnv)
 cet_cmake_env()
@@ -22,18 +23,18 @@ cet_set_compiler_flags(DIAGS CAUTIOUS
   EXTRA_FLAGS -pedantic -Wno-unused-local-typedefs
 )
 
-cet_report_compiler_flags()
+cet_report_compiler_flags() ### MIGRATE-ACTION-RECOMMENDED (migrate-3.05.03) - add args: REPORT_THRESHOLD VERBOSE
 
-find_package(cetlib_except REQUIRED PUBLIC)
-find_package(cetlib REQUIRED PUBLIC)
-find_package(messagefacility REQUIRED PUBLIC)
-find_package(canvas REQUIRED PUBLIC)
+find_package(cetlib_except REQUIRED EXPORT)
+find_package(cetlib REQUIRED EXPORT)
+find_package(messagefacility REQUIRED EXPORT)
+find_package(canvas REQUIRED EXPORT)
 find_package(canvas_root_io REQUIRED)
-find_package(CLHEP COMPONENTS Geometry Vector REQUIRED PUBLIC)
+find_package(CLHEP COMPONENTS Geometry Vector REQUIRED EXPORT)
 find_package(Boost REQUIRED)
-find_package(ROOT COMPONENTS Core Physics Geom GenVector REQUIRED PUBLIC)
+find_package(ROOT COMPONENTS Core Physics Geom GenVector REQUIRED EXPORT)
 
-find_ups_product( larcoreobj )
+find_package( larcoreobj REQUIRED )
 
 # macros for artdaq_dictionary and simple_plugin
 include(ArtDictionary)
@@ -47,7 +48,6 @@ add_subdirectory(larcorealg)
 add_subdirectory(test)
 
 # ups - table and config files
-add_subdirectory(ups)
 
 # packaging utility
-include(UseCPack)
+cet_cmake_config()
diff --git a/larcorealg/CoreUtils/CMakeLists.txt b/larcorealg/CoreUtils/CMakeLists.txt
@@ -1,7 +1,7 @@
 cet_make(LIBRARIES
            cetlib::cetlib
            cetlib_except::cetlib_except
-        )
+        ) ### MIGRATE-ACTION-RECOMMENDED (migrate-3.05.03) - deprecated: use cet_make_library(), build_dictonary(), cet_plugin() with explicit source lists and plugin base types
 
 install_headers()
 install_source()
diff --git a/larcorealg/GeoAlgo/CMakeLists.txt b/larcorealg/GeoAlgo/CMakeLists.txt
@@ -2,7 +2,7 @@ cet_make(NO_DICTIONARY
          LIBRARIES
            ROOT::Core
            ROOT::Physics
-         )
+         ) ### MIGRATE-ACTION-RECOMMENDED (migrate-3.05.03) - deprecated: use cet_make_library(), build_dictonary(), cet_plugin() with explicit source lists and plugin base types
 
 art_dictionary(DICTIONARY_LIBRARIES larcorealg_GeoAlgo)
 

diff --git a/larcorealg/Geometry/CMakeLists.txt b/larcorealg/Geometry/CMakeLists.txt
@@ -12,7 +12,7 @@ cet_make(
           ROOT::Geom
           ROOT::GenVector
           CLHEP::Geometry
-        )
+        ) ### MIGRATE-ACTION-RECOMMENDED (migrate-3.05.03) - deprecated: use cet_make_library(), build_dictonary(), cet_plugin() with explicit source lists and plugin base types
 
 install_headers(SUBDIRS "details")
 install_fhicl(SUBDIRS "details")

diff --git a/larcorealg/TestUtils/CMakeLists.txt b/larcorealg/TestUtils/CMakeLists.txt
@@ -1,4 +1,4 @@
-cet_make(LIBRARIES canvas::canvas cetlib_except)
+cet_make(LIBRARIES canvas::canvas cetlib_except) ### MIGRATE-ACTION-RECOMMENDED (migrate-3.05.03) - deprecated: use cet_make_library(), build_dictonary(), cet_plugin() with explicit source lists and plugin base types
 
 install_headers()
 install_source()
diff --git a/ups/CMakeLists.txt b/ups/CMakeLists.txt
diff --git a/ups/product-config.cmake.in b/ups/product-config.cmake.in