Update upper end of cmake_minimum_required range (#241)

lawruble13 · web-flow · commit d0aa73b9118d · 2025-04-10T15:37:48.000-06:00
* Update upper end of cmake_minimum_required range

CMake 3.31 is dropping support for cmake_minimum_required for versions less than 3.10, but adding 3.25 (which is tested on math-ci) indicates that we test compatibility with 3.25, which causes those warnings to be suppressed.

* Add CMake version 3.31.0 to testing

* Change CMP0079 behaviour

* Update upper end of range to latest version tested (3.31.0)

* Update CMake versions in test.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,8 +35,9 @@ jobs:
           - ubuntu-20.04
           - windows-2019
         cmake-version:
-          - 3.20.0
-          - 3.10.2
+          - 3.31.0
+          - 3.22.1
+          - 3.16.3
         exclude:
           - platform: windows-2019
             cmake-version: 3.10.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Copyright (C) 2017 Advanced Micro Devices, Inc.
 ################################################################################
 
-cmake_minimum_required (VERSION 3.6)
+cmake_minimum_required (VERSION 3.6...3.31.0)
 
 set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "")
 
diff --git a/share/rocmcmakebuildtools/cmake/ROCMTest.cmake b/share/rocmcmakebuildtools/cmake/ROCMTest.cmake
@@ -31,7 +31,7 @@ macro(rocm_enable_test_package NAME)
 endmacro()
 
 if(POLICY CMP0079)
-    cmake_policy(SET CMP0079 OLD)
+    cmake_policy(SET CMP0079 NEW)
 endif()
 
 add_library(rocm_test_dependencies INTERFACE)
diff --git a/test/analyze/CMakeLists.txt b/test/analyze/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(simple LANGUAGES CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/docsphinx/CMakeLists.txt b/test/docsphinx/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Copyright (C) 2023 Advanced Micro Devices, Inc.
 ################################################################################
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(useful LANGUAGES CXX)
 # Ideally should be NONE, but GNUInstallDirs detects platform arch using try_compile
 # https://stackoverflow.com/questions/43379311/why-does-project-affect-cmakes-opinion-on-cmake-sizeof-void-p
diff --git a/test/findpackagecheck/CMakeLists.txt b/test/findpackagecheck/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(findpackagecheck CXX)
 
 message(STATUS "PKG: ${PKG}")
diff --git a/test/libbasic/CMakeLists.txt b/test/libbasic/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(basic CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/libheaderonly/CMakeLists.txt b/test/libheaderonly/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(headeronly LANGUAGES NONE)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/libprivate/CMakeLists.txt b/test/libprivate/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(libprivate CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/libsimple/CMakeLists.txt b/test/libsimple/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(simple CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/libsimple2/CMakeLists.txt b/test/libsimple2/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(simple2 CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/libsimplecompat/CMakeLists.txt b/test/libsimplecompat/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(simple CXX)
 
 find_package(ROCM)
diff --git a/test/libsimpletest/CMakeLists.txt b/test/libsimpletest/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(simple CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/libwrapper/CMakeLists.txt b/test/libwrapper/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(test-wrapper CXX)
 
 find_package(ROCmCMakeBuildTools)
diff --git a/test/pass/rocm-package-setup-component.cmake b/test/pass/rocm-package-setup-component.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.10...3.31.0)
 
 use_rocm_cmake()
 include(ROCMCreatePackage)
diff --git a/test/toolchain-var/CMakeLists.txt b/test/toolchain-var/CMakeLists.txt
@@ -3,7 +3,7 @@
 ################################################################################
 
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 find_package(ROCmCMakeBuildTools)
 project(toolchain-var CXX)
 
diff --git a/test/version/CMakeLists.txt b/test/version/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Copyright (C) 2017 Advanced Micro Devices, Inc.
 ################################################################################
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.31.0)
 project(simple LANGUAGES NONE)
 
 find_package(ROCmCMakeBuildTools)
