Tests: Modernize RunCMake.CMP0129 test conventions and conditions

16 files changed, 34 insertions, 29 deletions

diff --git a/Tests/RunCMake/CMP0129/C-NEW.cmake b/Tests/RunCMake/CMP0129/C-NEW.cmake
new file mode 100644
index 0000000..1c8f4c0
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/C-NEW.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0129 NEW)
+include(C-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/C-OLD.cmake b/Tests/RunCMake/CMP0129/C-OLD.cmake
new file mode 100644
index 0000000..789bf64
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/C-OLD.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0129 OLD)
+include(C-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/C-WARN.cmake b/Tests/RunCMake/CMP0129/C-WARN.cmake
new file mode 100644
index 0000000..09b5167
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/C-WARN.cmake
@@ -0,0 +1 @@
+include(C-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/C.cmake b/Tests/RunCMake/CMP0129/C-common.cmake
index e9ebe90..1e91327 100644
--- a/Tests/RunCMake/CMP0129/C.cmake
+++ b/Tests/RunCMake/CMP0129/C-common.cmake
@@ -1,7 +1,3 @@
-if(SET_CMP0129)
-  cmake_policy(SET CMP0129 ${SET_CMP0129})
-endif()
-
 enable_language(C)
 set(CMAKE_VERBOSE_MAKEFILE TRUE)
 include(CompareCompilerVersion.cmake)
diff --git a/Tests/RunCMake/CMP0129/CMakeLists.txt b/Tests/RunCMake/CMP0129/CMakeLists.txt
index d8200fc..f5cf5b7 100644
--- a/Tests/RunCMake/CMP0129/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0129/CMakeLists.txt
@@ -1,3 +1,3 @@
 cmake_minimum_required(VERSION 3.22)
 project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake)
+include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
diff --git a/Tests/RunCMake/CMP0129/CXX-NEW.cmake b/Tests/RunCMake/CMP0129/CXX-NEW.cmake
new file mode 100644
index 0000000..00cd7c5
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/CXX-NEW.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0129 NEW)
+include(CXX-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/CXX-OLD.cmake b/Tests/RunCMake/CMP0129/CXX-OLD.cmake
new file mode 100644
index 0000000..b7d8641
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/CXX-OLD.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0129 OLD)
+include(CXX-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/CXX-WARN.cmake b/Tests/RunCMake/CMP0129/CXX-WARN.cmake
new file mode 100644
index 0000000..db36956
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/CXX-WARN.cmake
@@ -0,0 +1 @@
+include(CXX-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/CXX.cmake b/Tests/RunCMake/CMP0129/CXX-common.cmake
index ffb81b8..016e8ff 100644
--- a/Tests/RunCMake/CMP0129/CXX.cmake
+++ b/Tests/RunCMake/CMP0129/CXX-common.cmake
@@ -1,7 +1,3 @@
-if(SET_CMP0129)
-  cmake_policy(SET CMP0129 ${SET_CMP0129})
-endif()
-
 enable_language(CXX)
 set(CMAKE_VERBOSE_MAKEFILE TRUE)
 include(CompareCompilerVersion.cmake)
diff --git a/Tests/RunCMake/CMP0129/Fortran-NEW.cmake b/Tests/RunCMake/CMP0129/Fortran-NEW.cmake
new file mode 100644
index 0000000..6ac9cb9
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/Fortran-NEW.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0129 NEW)
+include(Fortran-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/Fortran-OLD.cmake b/Tests/RunCMake/CMP0129/Fortran-OLD.cmake
new file mode 100644
index 0000000..df6ca83
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/Fortran-OLD.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0129 OLD)
+include(Fortran-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/Fortran-WARN.cmake b/Tests/RunCMake/CMP0129/Fortran-WARN.cmake
new file mode 100644
index 0000000..3dc27c3
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/Fortran-WARN.cmake
@@ -0,0 +1 @@
+include(Fortran-common.cmake)
diff --git a/Tests/RunCMake/CMP0129/Fortran-common.cmake b/Tests/RunCMake/CMP0129/Fortran-common.cmake
new file mode 100644
index 0000000..7b6ecc7
--- /dev/null
+++ b/Tests/RunCMake/CMP0129/Fortran-common.cmake
@@ -0,0 +1,4 @@
+enable_language(Fortran)
+set(CMAKE_VERBOSE_MAKEFILE TRUE)
+include(CompareCompilerVersion.cmake)
+compare_compiler_version(Fortran)
diff --git a/Tests/RunCMake/CMP0129/Fortran.cmake b/Tests/RunCMake/CMP0129/Fortran.cmake
deleted file mode 100644
index abaca7e..0000000
--- a/Tests/RunCMake/CMP0129/Fortran.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-include(CheckLanguage)
-check_language(Fortran)
-if(NOT CMAKE_Fortran_COMPILER)
-  # No Fortran compiler, skipping Fortran test
-  return()
-endif()
-
-if(SET_CMP0129)
-  cmake_policy(SET CMP0129 ${SET_CMP0129})
-endif()
-
-enable_language(Fortran)
-set(CMAKE_VERBOSE_MAKEFILE TRUE)
-include(CompareCompilerVersion.cmake)
-compare_compiler_version(Fortran)
diff --git a/Tests/RunCMake/CMP0129/RunCMakeTest.cmake b/Tests/RunCMake/CMP0129/RunCMakeTest.cmake
index 1b0e11b..c147352 100644
--- a/Tests/RunCMake/CMP0129/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0129/RunCMakeTest.cmake
@@ -1,8 +1,14 @@
 set(RunCMake_TEST_NO_CMP0129 ON)
 include(RunCMake)
 
-foreach(lang C CXX Fortran)
-  run_cmake(${lang})
-  run_cmake_with_options(${lang} "-DSET_CMP0129=NEW")
-  run_cmake_with_options(${lang} "-DSET_CMP0129=OLD")
-endforeach()
+run_cmake(C-WARN)
+run_cmake(C-OLD)
+run_cmake(C-NEW)
+run_cmake(CXX-WARN)
+run_cmake(CXX-OLD)
+run_cmake(CXX-NEW)
+if(CMake_TEST_Fortran)
+  run_cmake(Fortran-WARN)
+  run_cmake(Fortran-OLD)
+  run_cmake(Fortran-NEW)
+endif()
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e205d9f..213c18d 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -153,6 +153,9 @@ add_RunCMake_test(CMP0126)
 if("${CMAKE_C_COMPILER_ID}" STREQUAL "LCC" OR
    "${CMAKE_CXX_COMPILER_ID}" STREQUAL "LCC" OR
    "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "LCC")
+  if(CMAKE_Fortran_COMPILER)
+    list(APPEND CMP0129_ARGS -DCMake_TEST_Fortran=1)
+  endif()
   add_RunCMake_test("CMP0129")
   set_property(TEST RunCMake.CMP0129 APPEND PROPERTY LABELS "Fortran")
 endif()