Merge branch 'release/4.01.01'

greenc-FNAL · greenc-FNAL · commit 39f03b119c63 · 2025-09-22T14:45:23.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ set(cetmodules_MIN_CMAKE_VERSION 3.24)
 
 # Required to keep CMake happy.
 cmake_minimum_required(
-  VERSION ${cetmodules_MIN_CMAKE_VERSION}...3.31 FATAL_ERROR
+  VERSION ${cetmodules_MIN_CMAKE_VERSION}...4.1 FATAL_ERROR
   )
 
 # Bootstrap finding our own modules.
diff --git a/Modules/BasicPlugin.cmake b/Modules/BasicPlugin.cmake
@@ -15,7 +15,7 @@ Module defining commands to facilitate the building of plugins:
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetMakeLibrary)
@@ -639,7 +639,7 @@ function(cet_write_plugin_builder TYPE BASE DEST_SUBDIR)
     "${${CETMODULES_CURRENT_PROJECT_NAME}_BINARY_DIR}/${DEST_SUBDIR}/${TYPE}.cmake"
     "\
 include_guard()
-cmake_minimum_required(VERSION 3.18...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18...4.1 FATAL_ERROR)
 
 ${extra_includes}include(BasicPlugin)
 
diff --git a/Modules/BuildDictionary.cmake b/Modules/BuildDictionary.cmake
@@ -19,7 +19,7 @@ BuildDictionary
 
 include_guard()
 
-cmake_minimum_required(VERSION 3.19...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetCopy)
diff --git a/Modules/CetCMakeConfig.cmake b/Modules/CetCMakeConfig.cmake
@@ -19,7 +19,7 @@ Module defining the lazy functions:
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.19.6...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19.6...4.1 FATAL_ERROR)
 
 include(CMakePackageConfigHelpers)
 include(CetCMakeUtils)
diff --git a/Modules/CetCMakeEnv.cmake b/Modules/CetCMakeEnv.cmake
@@ -10,7 +10,7 @@ the current project.
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.19...3.27 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19...4.1 FATAL_ERROR)
 
 # Escape characters for literal use in regular expressions.
 include(CetRegexEscape)
@@ -45,7 +45,15 @@ if(NOT CMAKE_INSTALL_LIBDIR)
 endif()
 
 # See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html.
+#
+# We suppress developer warnings for this `include()` to silence
+# complaints from CMake >=4 when no `LANGUAGES` are enabled for this
+# project.
+set(_cce_suppress_dev_warnings "$CACHE{CMAKE_SUPPRESS_DEVELOP_WARNINGS}")
+set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON CACHE INTERNAL "" FORCE)
 include(GNUInstallDirs)
+set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS "${_cce_suppress_dev_warnings}" CACHE INTERNAL "" FORCE)
+unset(_cce_suppress_dev_warnings)
 # ##############################################################################
 
 define_property(
diff --git a/Modules/CetCMakeUtils.cmake b/Modules/CetCMakeUtils.cmake
@@ -8,7 +8,7 @@ General functions and macros.
 
 include_guard()
 
-cmake_minimum_required(VERSION 3.20...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20...4.1 FATAL_ERROR)
 
 include(CetRegexEscape)
 include(CetRegisterExportSet)
diff --git a/Modules/CetCmdWrapper.cmake b/Modules/CetCmdWrapper.cmake
@@ -33,7 +33,7 @@ Variables affecting Behavior
   deleted upon non-zero exit from the command.
 
 #]================================================================]
-cmake_minimum_required(VERSION 3.20...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20...4.1 FATAL_ERROR)
 
 if(NOT CMD)
   message(FATAL_ERROR "vacuous command")
diff --git a/Modules/CetCopy.cmake b/Modules/CetCopy.cmake
@@ -10,7 +10,7 @@ to a destination directory as part of the build.
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetPackagePath)
 
diff --git a/Modules/CetFindPkgConfigPackage.cmake b/Modules/CetFindPkgConfigPackage.cmake
@@ -8,7 +8,7 @@ Define the function :command:`cet_find_pkg_config_package` for use in
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 2.8.12...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5...4.1 FATAL_ERROR)
 
 include(FindPackageHandleStandardArgs)
 
diff --git a/Modules/CetGenerateSphinxDocs.cmake b/Modules/CetGenerateSphinxDocs.cmake
@@ -4,7 +4,7 @@ CetGenerateSphinxDocs
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.20...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20...4.1 FATAL_ERROR)
 
 set(_CGSD_VDATA_VERSION 1)
 
diff --git a/Modules/CetInstall.cmake b/Modules/CetInstall.cmake
@@ -23,7 +23,7 @@ default or enforced characteristics for files of a particular type.
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetCopy)
diff --git a/Modules/CetInstalledPath.cmake b/Modules/CetInstalledPath.cmake
@@ -9,7 +9,7 @@ installation path.
 
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetPackagePath)
 include(CetRegexEscape)
diff --git a/Modules/CetMake.cmake b/Modules/CetMake.cmake
@@ -14,7 +14,7 @@ operations in CMake:
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetCopy)
diff --git a/Modules/CetMakeCompletions.cmake b/Modules/CetMakeCompletions.cmake
@@ -10,7 +10,7 @@ completion shell code.
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 
diff --git a/Modules/CetMakeLibrary.cmake b/Modules/CetMakeLibrary.cmake
@@ -9,7 +9,7 @@ libraries and plugins.
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetInstalledPath)
diff --git a/Modules/CetPackagePath.cmake b/Modules/CetPackagePath.cmake
@@ -10,7 +10,7 @@ relative to a project's top level directory.
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 #[================================================================[.rst:
 .. command:: cet_package_path
diff --git a/Modules/CetProcessLiblist.cmake b/Modules/CetProcessLiblist.cmake
@@ -6,7 +6,7 @@ X
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 function(cet_process_liblist RESULT_VAR)
   cet_convert_target_args(${ARGV})
diff --git a/Modules/CetProvideDependency.cmake b/Modules/CetProvideDependency.cmake
@@ -64,7 +64,7 @@ X
 # Once only per directory!
 include_guard()
 
-cmake_minimum_required(VERSION 3.24...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.24...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(ParseVersionString)
diff --git a/Modules/CetRegexEscape.cmake b/Modules/CetRegexEscape.cmake
@@ -12,7 +12,7 @@ unwanted interpolation or interpretation by CMake.
 include_guard()
 
 # Non-disruptive CMake version requirements.
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 #[================================================================[.rst:
 .. command:: cet_armor_string
diff --git a/Modules/CetRegisterExportSet.cmake b/Modules/CetRegisterExportSet.cmake
@@ -9,7 +9,7 @@ target namespaces.
 
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(ProjectVariable)
 
diff --git a/Modules/CetRootCint.cmake b/Modules/CetRootCint.cmake
@@ -8,7 +8,7 @@ Defines the deprecated function :commmand:`cet_rootcint`.
 
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetPackagePath)
 
diff --git a/Modules/CetSetVersionFromFile.cmake b/Modules/CetSetVersionFromFile.cmake
@@ -5,7 +5,7 @@ CetSetVersionFromFile
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.20...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20...4.1 FATAL_ERROR)
 
 #[============================================================[.rst:
 .. command:: cet_set_version_from_file
diff --git a/Modules/CetTest.cmake b/Modules/CetTest.cmake
@@ -11,7 +11,7 @@ CetTest
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.19...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19...4.1 FATAL_ERROR)
 
 # For warn_deprecated()
 include(CetCMakeUtils)
diff --git a/Modules/CheckClassVersion.cmake b/Modules/CheckClassVersion.cmake
@@ -11,7 +11,7 @@ CheckClassVersion
 #]================================================================]
 
 include_guard()
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 set(CCV_DEFAULT_RECURSIVE
     FALSE
diff --git a/Modules/GenerateFromFragments.cmake b/Modules/GenerateFromFragments.cmake
@@ -4,7 +4,7 @@ X
 #]================================================================]
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetPackagePath)
diff --git a/Modules/InstallFW.cmake b/Modules/InstallFW.cmake
@@ -13,7 +13,7 @@ InstallFW
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetInstall)
 include(ProjectVariable)
diff --git a/Modules/InstallGdml.cmake b/Modules/InstallGdml.cmake
@@ -13,7 +13,7 @@ InstallGdml
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetInstall)
 include(ProjectVariable)
diff --git a/Modules/InstallHeaders.cmake b/Modules/InstallHeaders.cmake
@@ -9,7 +9,7 @@ Install headers.
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetInstall)
diff --git a/Modules/InstallPerllib.cmake b/Modules/InstallPerllib.cmake
@@ -12,7 +12,7 @@ InstallPerllib
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetCMakeUtils)
 include(CetInstall)
diff --git a/Modules/InstallPkgMeta.cmake b/Modules/InstallPkgMeta.cmake
@@ -11,7 +11,7 @@ This module defines :command:`install_pkgmeta` and the deprecated
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetInstall)
 include(ProjectVariable)
diff --git a/Modules/InstallPython.cmake b/Modules/InstallPython.cmake
@@ -10,7 +10,7 @@ invoke a Python ``distutils`` :file:`setup.py` script.
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 #[================================================================[.rst:
 .. command:: install_python
diff --git a/Modules/InstallScripts.cmake b/Modules/InstallScripts.cmake
@@ -9,7 +9,7 @@ Install scripts.
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetInstall)
 include(ProjectVariable)
diff --git a/Modules/InstallSource.cmake b/Modules/InstallSource.cmake
@@ -31,7 +31,7 @@ Install source files.
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetInstall)
 include(CetPackagePath)
diff --git a/Modules/InstallWP.cmake b/Modules/InstallWP.cmake
@@ -13,7 +13,7 @@ InstallWP
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetInstall)
 include(ProjectVariable)
diff --git a/Modules/ParseAndAddCatchTests.cmake b/Modules/ParseAndAddCatchTests.cmake
@@ -95,7 +95,7 @@ register them with :command:`add_test()
 # example to add further labels or properties to the tests.    # #
 # ==================================================================================================#
 
-cmake_minimum_required(VERSION 2.8.12...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5...4.1 FATAL_ERROR)
 
 option(PARSE_CATCH_TESTS_VERBOSE "Print Catch to CTest parser debug messages"
        OFF
diff --git a/Modules/ParseVersionString.cmake b/Modules/ParseVersionString.cmake
@@ -35,7 +35,7 @@ non-CMake-compliant version strings:
 include_guard()
 
 # Need list(POP_FRONT...).
-cmake_minimum_required(VERSION 3.15...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15...4.1 FATAL_ERROR)
 
 set(CET_PARSE_VERSION_STRING_MIN_CETMODULES_VERSION 2.21.00)
 
diff --git a/Modules/ProcessSmc.cmake b/Modules/ProcessSmc.cmake
@@ -10,7 +10,7 @@ from an `SMC <https://smc.sourceforge.net/>`_ :file:`.sm` file.
 # Avoid unwanted repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 find_package(Smc 6.0.1 REQUIRED)
 
diff --git a/Modules/ProjectVariable.cmake b/Modules/ProjectVariable.cmake
@@ -36,7 +36,7 @@ Defined functions:
 include_guard()
 
 # Non-disruptive CMake version requirements.
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 # Default architecture-specific install directory types.
 set(CETMODULES_DEFAULT_ARCH_DIRS BIN_DIR CONFIG_OUTPUT_ROOT_DIR LIBEXEC_DIR
diff --git a/Modules/RunAndCompare.cmake b/Modules/RunAndCompare.cmake
@@ -22,7 +22,7 @@ X
 # OUTPUT_FILTERS A list of filters with arguments, quoted as appropriate
 # (mutually exclusive with OUTPUT_FILTER and OUTPUT_FILTER_ARGS).
 # ##############################################################################
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 # Utility function.
 function(filter_and_compare FILE REF)
diff --git a/Modules/SetCompilerFlags.cmake b/Modules/SetCompilerFlags.cmake
@@ -116,7 +116,7 @@ X
 # Avoid unnecessary repeat inclusion.
 include_guard()
 
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 include(CetPackagePath)
 include(CetRegexEscape)
diff --git a/Modules/private/CetExclude.cmake b/Modules/private/CetExclude.cmake
@@ -3,7 +3,7 @@ X
 -
 #]================================================================]
 include_guard()
-cmake_minimum_required(VERSION 3.18.2...3.31 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18.2...4.1 FATAL_ERROR)
 
 # Exclude items from a list of files.
 #
diff --git a/Modules/private/CetFindAbsoluteTransitiveDependencies.cmake b/Modules/private/CetFindAbsoluteTransitiveDependencies.cmake
diff --git a/Modules/private/CetToolchainOverrides.cmake b/Modules/private/CetToolchainOverrides.cmake
diff --git a/VERSION b/VERSION
diff --git a/etc/CompileOnlyTest.in b/etc/CompileOnlyTest.in
diff --git a/test/Modules/cet_exclude_from_list_t.cmake b/test/Modules/cet_exclude_from_list_t.cmake

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ set(cetmodules_MIN_CMAKE_VERSION 3.24)`
`25`	`25`
`26`	`26`	`# Required to keep CMake happy.`
`27`	`27`	`cmake_minimum_required(`
`28`		`- VERSION ${cetmodules_MIN_CMAKE_VERSION}...3.31 FATAL_ERROR`
	`28`	`+ VERSION ${cetmodules_MIN_CMAKE_VERSION}...4.1 FATAL_ERROR`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`# Bootstrap finding our own modules.`