Update CMake min version from 3.17 to 3.23 (TriBITSPub#411)

This is part of allowing TriBITS to take advantage of newer CMake features and replacing some older TriBITS code that now has (better or compatiable) native implementations in CMake (many years later). The min version of CMake 3.23 is chosen due to Trilinos (see trilinos/Trilinos#10355). Some non-obvious changes made were: * For some reason, find_file() wiht CMake 3.23 (and using CMak 3.23 default policies) adds on an extra '/' before the file name. This messed up the test checks but I fixed that by putting in '[/]*' in the regex to account for that. * Updated the GitHub Actions testing jobs to all be CMake 3.23+. (I updated the patch versions as well to the most recent patch releases as of right now. CMake 3.25 is still the most recent release of CMake as CMake 3.26 is still in release candidate testing.) * Add checks for setting CTEST_RESOURCE_SPEC_FILE in CTestTestfile.cmake now that CMake is >= 3.18. * Removed constant ${PROJECT_NAME}_CTEST_USE_NEW_AAO_FEATURES since it is hard-coded since CMake is 3.17+. * Removed some documentation discussing older versions of CMakew (which are no longer supported). * install-cmake.py: Changed the default version of CMake to install from 3.17 to 3.23. * install-cmake.py: Removed patch for CMake 3.17 * Removed documentation for Kitware fork of Ninja version < 1.10 since Ninja 1.10 has been out for many years.
bartlettroscoe · Feb 25, 2023 · 010674b · 010674b
1 parent 1a6335a
commit 010674b
Show file tree

Hide file tree

Showing 59 changed files with 81 additions and 485 deletions.
diff --git a/.github/workflows/tribits_testing.yml b/.github/workflows/tribits_testing.yml
@@ -19,10 +19,10 @@ jobs:
       fail-fast: false  # Allow each job to run to completion even if other jobs fail first
       matrix:
         config:
-          - { os: ubuntu-latest, cmake: "3.22.4", generator: "makefiles", python: "3.8", cc: gcc-9, cxx: g++-9, fc: gfortran-9 }
-          - { os: ubuntu-latest, cmake: "3.22.4", generator: "makefiles", python: "3.8", cc: gcc-10, cxx: g++-10 }
-          - { os: ubuntu-latest, cmake: "3.23.1", generator: "makefiles", python: "3.8", cc: gcc-11,  cxx: g++-11, fc: gfortran-11, no_have_ninja: no-ninja }
-          - { os: ubuntu-latest, cmake: "3.25.1", generator: "makefiles", python: "3.8", cc: gcc-11,  cxx: g++-11,  fc: gfortran-11  }
+          - { os: ubuntu-latest, cmake: "3.23.1", generator: "makefiles", python: "3.8", cc: gcc-9, cxx: g++-9, fc: gfortran-9 }
+          - { os: ubuntu-latest, cmake: "3.24.3", generator: "makefiles", python: "3.8", cc: gcc-10, cxx: g++-10 }
+          - { os: ubuntu-latest, cmake: "3.24.3", generator: "makefiles", python: "3.8", cc: gcc-11,  cxx: g++-11, fc: gfortran-11, no_have_ninja: no-ninja }
+          - { os: ubuntu-latest, cmake: "3.25.2", generator: "makefiles", python: "3.8", cc: gcc-11,  cxx: g++-11,  fc: gfortran-11  }
 
     runs-on: ${{ matrix.config.os }}
 

diff --git a/test/ci_support/TribitsStripCommentsFromCMakeCacheFile_TestDriver.cmake b/test/ci_support/TribitsStripCommentsFromCMakeCacheFile_TestDriver.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 #
 # This file is run as a cmake -P script to create a CMakeCache.clean.txt file

diff --git a/test/core/CTestScriptsUnitTests/CMakeLists.txt b/test/core/CTestScriptsUnitTests/CMakeLists.txt
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 #
 # The tests defined here are used to test the dynamic behavior of the

diff --git a/test/core/CTestScriptsUnitTests/EchoEnvVarForTest.cmake b/test/core/CTestScriptsUnitTests/EchoEnvVarForTest.cmake
@@ -37,6 +37,6 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("PASS_IN_FROM_ENV_VAR: $ENV{PASS_IN_FROM_ENV_VAR}")
diff --git a/test/core/CTestScriptsUnitTests/TAATDriver/bad_dest_dir/CMakeLists.txt b/test/core/CTestScriptsUnitTests/TAATDriver/bad_dest_dir/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0)
+cmake_minimum_required(VERSION 3.23.0)
 set(PROJECT_NAME TAATDriver)
 project(${PROJECT_NAME} NONE)
 

diff --git a/test/core/CTestScriptsUnitTests/TAATDriver/bad_file_name/CMakeLists.txt b/test/core/CTestScriptsUnitTests/TAATDriver/bad_file_name/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0)
+cmake_minimum_required(VERSION 3.23.0)
 set(PROJECT_NAME TAATDriver)
 project(${PROJECT_NAME} NONE)
 

diff --git a/test/core/CTestScriptsUnitTests/echoEnvVars.cmake b/test/core/CTestScriptsUnitTests/echoEnvVars.cmake
@@ -11,7 +11,7 @@
 # and it read and print these env vars up to 10
 #
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 set(maxNumEnvVars 10)
 

diff --git a/test/core/CompilerOptions_UnitTests.cmake b/test/core/CompilerOptions_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("PROJECT_NAME = ${PROJECT_NAME}")
 message("${PROJECT_NAME}_TRIBITS_DIR = ${${PROJECT_NAME}_TRIBITS_DIR}")

diff --git a/test/core/ExamplesUnitTests/DummyPackageClientCMakeLists.txt b/test/core/ExamplesUnitTests/DummyPackageClientCMakeLists.txt
@@ -52,7 +52,7 @@ message("FIND_PACKAGE_OPTIONAL_COMPONENTS (input) = '${FIND_PACKAGE_OPTIONAL_COM
 message("CMAKE_PREFIX_PATH = '${CMAKE_PREFIX_PATH}'")
 message("EXPORT_VAR_PREFIX = '${EXPORT_VAR_PREFIX}'")
 
-cmake_minimum_required(VERSION 3.17.0)
+cmake_minimum_required(VERSION 3.23.0)
 project(${DUMMY_PROJECT_NAME} NONE)
 
 if (FIND_PACKAGE_COMPONENTS)

diff --git a/test/core/ExamplesUnitTests/RunDummyPackageClientBulid.cmake b/test/core/ExamplesUnitTests/RunDummyPackageClientBulid.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 #
 # This file is run as a cmake -P script to create a new dummy project

diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject2_Tests.cmake
@@ -197,24 +197,24 @@ function(TribitsExampleProject2_find_tpl_parts  sharedOrStatic  findingTplsMetho
         "Tpl1_LIBRARY_NAMES='tpl1'"
         "Found lib '${tplInstallBaseDir}/install_tpl1/lib/libtpl1${libextregex}'"
         "TPL_Tpl1_LIBRARIES='${tplInstallBaseDir}/install_tpl1/lib/libtpl1${libextregex}'"
-        "Found header '${tplInstallBaseDir}/install_tpl1/include/Tpl1.hpp'"
+        "Found header '${tplInstallBaseDir}/install_tpl1/include[/]*/Tpl1.hpp'"
         "TPL_Tpl1_INCLUDE_DIRS='${tplInstallBaseDir}/install_tpl1/include'"
 
         "Tpl2_LIBRARY_NAMES='tpl2b[;]tpl2a'"
         "    Found lib '${tplInstallBaseDir}/install_tpl2/lib/libtpl2b${libextregex}'"
         "    Found lib '${tplInstallBaseDir}/install_tpl2/lib/libtpl2a${libextregex}'"
         "TPL_Tpl2_LIBRARIES='${tplInstallBaseDir}/install_tpl2/lib/libtpl2b${libextregex}[;]${tplInstallBaseDir}/install_tpl2/lib/libtpl2a${libextregex}'"
-        "    Found header '${tplInstallBaseDir}/install_tpl2/include/Tpl2a.hpp'"
+        "    Found header '${tplInstallBaseDir}/install_tpl2/include[/]*/Tpl2a.hpp'"
         "Found TPL 'Tpl2' include dirs '${tplInstallBaseDir}/install_tpl2/include'"
         "TPL_Tpl2_INCLUDE_DIRS='${tplInstallBaseDir}/install_tpl2/include'"
 
 	"Tpl3_LIBRARY_NAMES='tpl3'"
         "    Found lib '${tplInstallBaseDir}/install_tpl3/lib/libtpl3${libextregex}'"
         "TPL_Tpl3_LIBRARIES='${tplInstallBaseDir}/install_tpl3/lib/libtpl3${libextregex}'"
-        "    Found header '${tplInstallBaseDir}/install_tpl3/include/Tpl3.hpp'"
+        "    Found header '${tplInstallBaseDir}/install_tpl3/include[/]*/Tpl3.hpp'"
 	"TPL_Tpl3_INCLUDE_DIRS='${tplInstallBaseDir}/install_tpl3/include'"
 
-	"    Found header '${tplInstallBaseDir}/install_tpl4/include/Tpl4.hpp'"
+	"    Found header '${tplInstallBaseDir}/install_tpl4/include[/]*/Tpl4.hpp'"
 	"TPL_Tpl4_INCLUDE_DIRS='${tplInstallBaseDir}/install_tpl4/include'"
 
         ${searchingTplLibAndINcDirsRegexes}

diff --git a/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake b/test/core/ExamplesUnitTests/TribitsExampleProject_Tests.cmake
@@ -2584,7 +2584,7 @@ tribits_add_advanced_test( TribitsExampleProject_HeaderOnlyTpl_FailThenPass
     PASS_REGULAR_EXPRESSION_ALL
       "Processing enabled external package/TPL: HeaderOnlyTpl .enabled by SimpleCxx, disable with -DTPL_ENABLE_HeaderOnlyTpl=OFF."
       "-- Searching for headers in HeaderOnlyTpl_INCLUDE_DIRS='.*/tribits/examples/tpls/HeaderOnlyTpl'"
-      "Found header '.*/tribits/examples/tpls/HeaderOnlyTpl/HeaderOnlyTpl_stuff.hpp'"
+      "Found header '.*/tribits/examples/tpls/HeaderOnlyTpl[/]*/HeaderOnlyTpl_stuff.hpp'"
       "Found TPL 'HeaderOnlyTpl' include dirs '.*/tribits/examples/tpls/HeaderOnlyTpl'"
       "TPL_HeaderOnlyTpl_INCLUDE_DIRS='.*/tribits/examples/tpls/HeaderOnlyTpl'"
       "Configuring done"

diff --git a/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake b/test/core/ExamplesUnitTests/TribitsHelloWorld_Tests.cmake
@@ -797,16 +797,6 @@ tribits_add_advanced_test( TribitsHelloWorld_install_config_dummy_proj
   #
 
 
-# NOTE: In the below tests, we are only testing TriBITS support for generating
-# the ctest_resources.json file, setting the RESOURCES_GROUP and ENVIRONMENT
-# test properties, and testing CMake support for recognizing the
-# RESOURCES_GROUP test property and putting it in the CTestTestfile.cmake
-# file.  We are not actually running ctest or looking for the var
-# CTEST_RESOURCE_SPEC_FILE set in the CTestTestfile.cmake file.  (Support for
-# CTEST_RESOURCE_SPEC_FILE was not added proper until 3.18 so we can't rely on
-# it in these tests that work with CMake 3.17.)
-
-
 tribits_add_advanced_test( TribitsHelloWorld_ctest_resources_file_autogen_2_3
   OVERALL_WORKING_DIRECTORY TEST_NAME
   OVERALL_NUM_MPI_PROCS 1
@@ -841,6 +831,7 @@ tribits_add_advanced_test( TribitsHelloWorld_ctest_resources_file_autogen_2_3
       "ENVIRONMENT .CTEST_KOKKOS_DEVICE_TYPE=gpus."
       "PROCESSORS .1."
       "RESOURCE_GROUPS .1,gpus:1."
+      "CTEST_RESOURCE_SPEC_FILE .*/ctest_resources.json"
     ALWAYS_FAIL_ON_NONZERO_RETURN
 
   )

diff --git a/test/core/ProcessEnabledTpls/CMakeLists.txt b/test/core/ProcessEnabledTpls/CMakeLists.txt
@@ -148,7 +148,7 @@ create_process_enabled_tpls_test_case(
     "-- Searching for headers in HeaderOnlyTpl_INCLUDE_DIRS='.+/HeaderOnlyTpl'"
     "-- Searching for a header file in the set .HeaderOnlyTpl_stuff.hpp.:"
     "--   Searching for header 'HeaderOnlyTpl_stuff.hpp' ..."
-    "--     Found header '.+/HeaderOnlyTpl/HeaderOnlyTpl_stuff.hpp'"
+    "--     Found header '.+/HeaderOnlyTpl[/]*/HeaderOnlyTpl_stuff.hpp'"
     "-- Found TPL 'HeaderOnlyTpl' include dirs '.+/HeaderOnlyTpl'"
     "-- TPL_HeaderOnlyTpl_INCLUDE_DIRS='.+/HeaderOnlyTpl'"
     "Exported TPL_ENABLE_HeaderOnlyTpl='ON'"
@@ -332,10 +332,10 @@ create_process_enabled_tpls_test_case(
     "-- Searching for headers in HeadersAndLibsTpl_INCLUDE_DIRS='.+/HeadersAndLibsTpl/include'"
     "-- Searching for a header file in the set .HeadersAndLibsTpl_header1.hpp.:"
     "--   Searching for header 'HeadersAndLibsTpl_header1.hpp' [.][.][.]"
-    "--     Found header '.+/HeadersAndLibsTpl/include/HeadersAndLibsTpl_header1.hpp'"
+    "--     Found header '.+/HeadersAndLibsTpl/include[/]*/HeadersAndLibsTpl_header1.hpp'"
     "-- Searching for a header file in the set .HeadersAndLibsTpl_header2.hpp.:"
     "--   Searching for header 'HeadersAndLibsTpl_header2.hpp' [.][.][.]"
-    "--     Found header '.+/HeadersAndLibsTpl/include/HeadersAndLibsTpl_header2.hpp'"
+    "--     Found header '.+/HeadersAndLibsTpl/include[/]*/HeadersAndLibsTpl_header2.hpp'"
     "-- Found TPL 'HeadersAndLibsTpl' include dirs '.+/HeadersAndLibsTpl/include'"
     "-- TPL_HeadersAndLibsTpl_INCLUDE_DIRS='.+/HeadersAndLibsTpl/include'"
     "Exported TPL_HeadersAndLibsTpl_NOT_FOUND='FALSE'"
@@ -370,11 +370,11 @@ create_process_enabled_tpls_test_case(
     "-- Searching for a header file in the set .MissingHeader1.hpp HeadersAndLibsTpl_header1.hpp.:"
     "--   Searching for header 'MissingHeader1.hpp' [.][.][.]"
     "--   Searching for header 'HeadersAndLibsTpl_header1.hpp' [.][.][.]"
-    "--     Found header '.+/HeadersAndLibsTpl/include/HeadersAndLibsTpl_header1.hpp'"
+    "--     Found header '.+/HeadersAndLibsTpl/include[/]*/HeadersAndLibsTpl_header1.hpp'"
     "-- Searching for a header file in the set .MissingHeader2.hpp HeadersAndLibsTpl_header2.hpp.:"
     "--   Searching for header 'MissingHeader2.hpp' [.][.][.]"
     "--   Searching for header 'HeadersAndLibsTpl_header2.hpp' [.][.][.]"
-    "--     Found header '.+/HeadersAndLibsTpl/include/HeadersAndLibsTpl_header2.hpp'"
+    "--     Found header '.+/HeadersAndLibsTpl/include[/]*/HeadersAndLibsTpl_header2.hpp'"
     "-- Found TPL 'HeadersAndLibsTpl' include dirs '.+/HeadersAndLibsTpl/include'"
     "-- TPL_HeadersAndLibsTpl_INCLUDE_DIRS='.+/HeadersAndLibsTpl/include'"
     "Exported TPL_HeadersAndLibsTpl_NOT_FOUND='FALSE'"

diff --git a/test/core/ProcessEnabledTpls/TribitsProcessEnabledTplTesterCMakeLists.txt b/test/core/ProcessEnabledTpls/TribitsProcessEnabledTplTesterCMakeLists.txt
@@ -43,7 +43,7 @@
 # TribitsTplFindIncludeDirsAndLibraries.cmake modules.
 #
 
-cmake_minimum_required(VERSION 3.17.0)
+cmake_minimum_required(VERSION 3.23.0)
 
 # Passed in on command-line
 message("${PROJECT_NAME} = ${PROJECT_NAME}")

diff --git a/test/core/TestingFunctionMacro_UnitTests.cmake b/test/core/TestingFunctionMacro_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("PROJECT_NAME = ${PROJECT_NAME}")
 message("${PROJECT_NAME}_TRIBITS_DIR = ${${PROJECT_NAME}_TRIBITS_DIR}")

diff --git a/test/core/TribitsAdjustPackageEnables_UnitTests.cmake b/test/core/TribitsAdjustPackageEnables_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 include(${CMAKE_CURRENT_LIST_DIR}/TribitsAdjustPackageEnablesHelpers.cmake)
 

diff --git a/test/core/TribitsExternalPackageWriteConfigFile_UnitTests.cmake b/test/core/TribitsExternalPackageWriteConfigFile_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 # Echo input arguments
 message("PROJECT_NAME = '${PROJECT_NAME}'")

diff --git a/test/core/TribitsPackageDependencies_UnitTests.cmake b/test/core/TribitsPackageDependencies_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 # Echo input arguments
 message("PROJECT_NAME = '${PROJECT_NAME}'")

diff --git a/test/core/TribitsProcessExtraRepositoriesList_UnitTests.cmake b/test/core/TribitsProcessExtraRepositoriesList_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("PROJECT_NAME = ${PROJECT_NAME}")
 message("${PROJECT_NAME}_TRIBITS_DIR = ${${PROJECT_NAME}_TRIBITS_DIR}")

diff --git a/test/core/TribitsProcessPackagesAndDirsLists_UnitTests.cmake b/test/core/TribitsProcessPackagesAndDirsLists_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("PROJECT_NAME = ${PROJECT_NAME}")
 message("${PROJECT_NAME}_TRIBITS_DIR = ${${PROJECT_NAME}_TRIBITS_DIR}")

diff --git a/test/core/TribitsReadAllProjectDepsFilesCreateDepsGraph_UnitTests.cmake b/test/core/TribitsReadAllProjectDepsFilesCreateDepsGraph_UnitTests.cmake
@@ -44,7 +44,7 @@
 #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 include("${CMAKE_CURRENT_LIST_DIR}/TribitsReadAllProjectDepsFilesCreateDepsGraphHelpers.cmake")
 

diff --git a/test/core/TribitsWriteClientExportFiles_UnitTests.cmake b/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("CURRENT_TEST_DIRECTORY = ${CURRENT_TEST_DIRECTORY}")
 

diff --git a/test/ctest_driver/CTestDriverUnitTests.cmake b/test/ctest_driver/CTestDriverUnitTests.cmake
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("PROJECT_NAME = ${PROJECT_NAME}")
 message("${PROJECT_NAME}_TRIBITS_DIR = ${${PROJECT_NAME}_TRIBITS_DIR}")

diff --git a/tribits/CHANGELOG.md b/tribits/CHANGELOG.md
@@ -2,6 +2,12 @@
 ChangeLog for TriBITS
 ----------------------------------------
 
+## 2023-02-24:
+
+* **Changed:** Upgrade minimum required CMake version from 3.17 to 3.23.
+  Existing TriBITS projects that have already upgraded to require CMake 3.23+
+  should not notice any major changes due to this change.
+
 ## 2023-01-10:
 
 * **Added:** Added back support for deprecated variable

diff --git a/tribits/ci_support/TribitsDumpDepsXmlScript.cmake b/tribits/ci_support/TribitsDumpDepsXmlScript.cmake
@@ -50,7 +50,7 @@
 #       -P <tribitsDir>/ci_support/TribitsDumpDepsXmlScript.cmake
 #
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 # A) Echo input options (must be specified with -D arguments to CMake command)
 

diff --git a/tribits/core/config_tests/fmangle/CMakeLists.txt b/tribits/core/config_tests/fmangle/CMakeLists.txt
@@ -37,7 +37,7 @@
 # ************************************************************************
 # @HEADER
 
-cmake_minimum_required(VERSION 3.17)
+cmake_minimum_required(VERSION 3.23)
 project(fmangle C Fortran)
 add_definitions(${COMMON_DEFS})
 set(CMAKE_VERBOSE_MAKEFILE ON)

diff --git a/tribits/core/package_arch/TribitsAddAdvancedTest.cmake b/tribits/core/package_arch/TribitsAddAdvancedTest.cmake
@@ -858,7 +858,7 @@ include(PrintVar)
 # ``${PROJECT_NAME}_TRIBITS_DIR`` (pointing to the TriBITS location).  For example,
 # a valid project can be a simple as::
 #
-#   cmake_minimum_required(VERSION 3.17.0)
+#   cmake_minimum_required(VERSION 3.23.0)
 #   set(PROJECT_NAME TAATDriver)
 #   project(${PROJECT_NAME} NONE)
 #   set(${PROJECT_NAME}_TRACE_ADD_TEST TRUE)

diff --git a/tribits/core/package_arch/TribitsConstants.cmake b/tribits/core/package_arch/TribitsConstants.cmake
@@ -39,7 +39,7 @@
 
 # Define the TriBITS minimum required CMake version
 
-set(TRIBITS_CMAKE_MINIMUM_REQUIRED 3.17.0)
+set(TRIBITS_CMAKE_MINIMUM_REQUIRED 3.23.0)
 
 macro(tribits_asesrt_minimum_cmake_version)
 
@@ -50,12 +50,6 @@ macro(tribits_asesrt_minimum_cmake_version)
 
 endmacro()
 
-# Misc constants
-
-set(${PROJECT_NAME}_CTEST_USE_NEW_AAO_FEATURES TRUE)
-# NOTE: This is left to maintain backward compatibility after upgrade to CMake
-# 3.17 but this option is now hard-coded to TRUE in the implementation.
-
 # File names for TriBITS system
 
 set(${PROJECT_NAME}_PACKAGES_FILE_NAME PackagesList.cmake)

diff --git a/tribits/core/package_arch/tribits_get_version_date.cmake b/tribits/core/package_arch/tribits_get_version_date.cmake
@@ -11,7 +11,7 @@
 #     -P tribits_get_version_date.cmake
 #   
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 # A) Validate input
 

diff --git a/tribits/ctest_driver/TribitsCTestDriverCore.cmake b/tribits/ctest_driver/TribitsCTestDriverCore.cmake
@@ -50,7 +50,7 @@ message("*******************************")
 message("")
 
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 set(THIS_CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
@@ -1290,9 +1290,9 @@ include(TribitsCTestDriverCoreHelpers)
 # packages and therefore is more robust.  But the package-by-package mode is
 # more expensive in several respects for many projects.
 #
-# For versions of CMake 3.17.0 and above and newer versions of CDash, the
-# CDash server for the all-at-once mode will break down build and test results
-# on a package-by-package basis on CDash together.
+# For newer versions of CDash 3.1+, for the all-at-once mode, the CDash server
+# will break down build and test results on a package-by-package basis on
+# CDash together.
 #
 # .. _Multiple ctest -S invocations (tribits_ctest_driver()):
 #

diff --git a/tribits/ctest_driver/TribitsGetCTestTestXmlDir.cmake b/tribits/ctest_driver/TribitsGetCTestTestXmlDir.cmake
@@ -14,7 +14,7 @@
 # then prints the directory <build>/Testing/<buildstarttime> to STDOUT.
 #
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 if ("${PROJECT_NAME}" STREQUAL "")
   message(FATAL_ERROR "Error, PROJECT_NAME must be set!")

diff --git a/tribits/ctest_driver/tribits_ctest_update_commands.cmake b/tribits/ctest_driver/tribits_ctest_update_commands.cmake
@@ -18,7 +18,7 @@
 # 3.12) crash in that case.
 #
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("\ncmake -P tribits_ctest_update_commands.cmake:")
 message("-- GIT_EXE=${GIT_EXE}")

diff --git a/tribits/ctest_driver/tribits_ctest_update_commands_wrapper.cmake b/tribits/ctest_driver/tribits_ctest_update_commands_wrapper.cmake
@@ -7,7 +7,7 @@
 # the output (and does not send it to CDash).
 #
 
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 
 message("\ncmake -P tribits_ctest_update_commands_wrapper.cmake:")
 message("-- OUTPUT_FILE=${OUTPUT_FILE}\n")