Merge tag 'v3_14_04'

art 3.14.04
art-framework-suite · Feb 28, 2024 · 6c925ef · 6c925ef
2 parents b23ab81 + a64e544
commit 6c925ef
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 2.13.00 REQUIRED)
-project(art VERSION 3.14.03 LANGUAGES CXX C)
+project(art VERSION 3.14.04 LANGUAGES CXX C)
 
 include(CetCMakeEnv)
 cet_cmake_env()

diff --git a/Modules/ArtMake.cmake b/Modules/ArtMake.cmake
@@ -1,7 +1,7 @@
 ### MIGRATE-NO-ACTION
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 # art_make
 #
@@ -106,10 +106,11 @@ X
 
 include_guard()
 
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14...3.27 FATAL_ERROR)
 
 include(BuildPlugins)
 include(CetMake)
+include(CetMakeCommand)
 include(Compatibility)
 include(CetTest)
 

diff --git a/Modules/BuildPlugins.cmake b/Modules/BuildPlugins.cmake
@@ -1,6 +1,6 @@
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 # macros for building plugin libraries
 #
@@ -26,7 +26,7 @@ X
 ########################################################################
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...3.27 FATAL_ERROR)
 
 include(BasicPlugin)
 

diff --git a/Modules/art::module.cmake b/Modules/art::module.cmake
@@ -1,10 +1,10 @@
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...3.27 FATAL_ERROR)
 
 include(BasicPlugin)
 

diff --git a/Modules/art::plugin.cmake b/Modules/art::plugin.cmake
@@ -1,10 +1,10 @@
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.22 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...3.27 FATAL_ERROR)
 
 include(BasicPlugin)
 

diff --git a/Modules/art::service.cmake b/Modules/art::service.cmake
@@ -1,10 +1,10 @@
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...3.27 FATAL_ERROR)
 
 include(BasicPlugin)
 

diff --git a/Modules/art::source.cmake b/Modules/art::source.cmake
@@ -1,10 +1,10 @@
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...3.27 FATAL_ERROR)
 
 include(BasicPlugin)
 

diff --git a/Modules/art::tool.cmake b/Modules/art::tool.cmake
@@ -1,10 +1,10 @@
 #[================================================================[.rst:
 X
-=
+-
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...3.27 FATAL_ERROR)
 
 include(BasicPlugin)
 

diff --git a/art/test/CMakeLists.txt b/art/test/CMakeLists.txt
@@ -2,6 +2,9 @@ include(CetTest)
 cet_enable_asserts()
 cet_test_env("FHICL_FILE_PATH=.")
 
+cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE)
+cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})
+
 find_package(Boost COMPONENTS filesystem graph REQUIRED)
 find_package(Catch2 REQUIRED)
 find_package(canvas REQUIRED EXPORT)

diff --git a/ups/product_deps b/ups/product_deps
@@ -248,10 +248,10 @@ perllib	product_dir
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-canvas		v3_16_03
+canvas		v3_16_04
 hep_concurrency	v1_09_02
 catch		v3_3_2		-	only_for_build
-cetmodules	v3_22_02	-	only_for_build
+cetmodules	v3_24_01	-	only_for_build
 range		v3_0_12_0	-	only_for_build
 end_product_list
 ####################################