1 files changed, 9 insertions, 57 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 3038ed8..6bf8f3f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -299,8 +299,8 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja")
   add_RunCMake_test(CompilerChange)
 endif()
 add_RunCMake_test(CompilerNotFound)
-if (APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
-  list(APPEND CompilerTest_ARGS -DCMake_TEST_OBJC=1)
+if(DEFINED CMake_TEST_OBJC)
+  list(APPEND CompilerTest_ARGS -DCMake_TEST_OBJC=${CMake_TEST_OBJC})
 endif()
 if(CMAKE_Fortran_COMPILER)
   list(APPEND CompilerTest_ARGS -DCMake_TEST_Fortran=1)
@@ -502,64 +502,15 @@ if(APPLE)
 endif()
 
 function(add_RunCMake_test_try_compile)
-  if(CMAKE_VERSION VERSION_LESS 3.9.20170907 AND "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
-    # Older CMake versions do not know about MSVC language standards.
-    # Approximate our logic from MSVC-CXX.cmake.
-    if ((NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.24215.1 AND
-         CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) OR
-         NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10.25017)
-      set(CMAKE_CXX_STANDARD_DEFAULT 14)
-    elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
-      set(CMAKE_CXX_STANDARD_DEFAULT "")
-    else()
-      unset(CMAKE_CXX_STANDARD_DEFAULT)
-    endif()
-  endif()
-  if(CMAKE_VERSION VERSION_LESS 3.18.20200813 AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC")
-    # Older CMake versions do not know about MSVC language standards.
-    # Approximate our logic from MSVC-C.cmake.
-    if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 19.27)
-      set(CMAKE_C_STANDARD_DEFAULT 99)
-    else()
-      set(CMAKE_C_STANDARD_DEFAULT "")
-    endif()
-  endif()
-  if(CMAKE_VERSION VERSION_LESS 3.20.20210225 AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang")
-    # Older CMake versions do not know about Clang MSVC compatibility mode
-    # standards. Approximate the logic from Clang-C.cmake.
-    if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
-      set(CMAKE_C_STANDARD_DEFAULT 17)
-    elseif(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 3.5.2)
-      set(CMAKE_C_STANDARD_DEFAULT 11)
-    endif()
-  endif()
-  if(CMAKE_VERSION VERSION_LESS 3.20.6 AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xIntelLLVM" AND "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
-    # Older CMake versions accidentally set the default standards to empty when
-    # IntelLLVM targets the MSVC ABI, thus not activating standard selection.
-    # Approximate the logic from IntelLLVM-{C,CXX}.cmake.
-    if(DEFINED CMAKE_C_STANDARD_DEFAULT AND "${CMAKE_C_STANDARD_DEFAULT}" STREQUAL "")
-      set(CMAKE_C_STANDARD_DEFAULT 17)
-    endif()
-    if(DEFINED CMAKE_CXX_STANDARD_DEFAULT AND "${CMAKE_CXX_STANDARD_DEFAULT}" STREQUAL "")
-      set(CMAKE_CXX_STANDARD_DEFAULT 14)
-    endif()
-  endif()
   foreach(
     var
     IN ITEMS
       CMAKE_SYSTEM_NAME
-      CMAKE_C_COMPILER_ID
-      CMAKE_C_COMPILER_VERSION
-      CMAKE_C_STANDARD_DEFAULT
-      CMAKE_CXX_COMPILER_ID
-      CMAKE_CXX_COMPILER_VERSION
-      CMAKE_CXX_STANDARD_DEFAULT
       CMake_TEST_CUDA
       CMake_TEST_ISPC
       CMake_TEST_HIP
+      CMake_TEST_OBJC
       CMake_TEST_FILESYSTEM_1S
-      CMAKE_OBJC_STANDARD_DEFAULT
-      CMAKE_OBJCXX_STANDARD_DEFAULT
     )
     if(DEFINED ${var})
       list(APPEND try_compile_ARGS -D${var}=${${var}})
@@ -756,7 +707,8 @@ add_RunCMake_test(CheckCompilerFlag   -DCMake_TEST_CUDA=${CMake_TEST_CUDA}
 add_RunCMake_test(CheckSourceCompiles -DCMake_TEST_CUDA=${CMake_TEST_CUDA}
                                       -DCMake_TEST_ISPC=${CMake_TEST_ISPC}
                                       -DCMAKE_Fortran_COMPILER_ID=${CMAKE_Fortran_COMPILER_ID}
-                                      -DCMake_TEST_HIP=${CMake_TEST_HIP})
+                                      -DCMake_TEST_HIP=${CMake_TEST_HIP}
+                                      -DCMake_TEST_Swift=${CMake_TEST_Swift})
 add_RunCMake_test(CheckSourceRuns     -DCMake_TEST_CUDA=${CMake_TEST_CUDA}
                                       -DCMAKE_Fortran_COMPILER_ID=${CMAKE_Fortran_COMPILER_ID}
                                       -DCMake_TEST_HIP=${CMake_TEST_HIP})
@@ -896,13 +848,13 @@ if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
   if(DEFINED CMake_TEST_ISPC)
     list(APPEND CompilerLauncher_ARGS -DCMake_TEST_ISPC=${CMake_TEST_ISPC})
   endif()
+  if(DEFINED CMake_TEST_OBJC)
+    list(APPEND CompilerLauncher_ARGS -DCMake_TEST_OBJC=${CMake_TEST_OBJC})
+    list(APPEND LinkerLauncher_ARGS   -DCMake_TEST_OBJC=${CMake_TEST_OBJC})
+  endif()
   if(CMAKE_Fortran_COMPILER)
     list(APPEND CompilerLauncher_ARGS -DCMake_TEST_Fortran=1)
   endif()
-  if (APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
-    list(APPEND CompilerLauncher_ARGS -DCMake_TEST_OBJC=1)
-    list(APPEND LinkerLauncher_ARGS -DCMake_TEST_OBJC=1)
-  endif()
   add_RunCMake_test(CompilerLauncher)
   set_property(TEST RunCMake.CompilerLauncher APPEND
     PROPERTY LABELS "CUDA;HIP;ISPC")