Features: Centralize per-compiler recording macros

Simplify and de-duplicate per-compiler feature recording macros and
convert to a centralized per-language macro.

11 files changed, 38 insertions, 64 deletions

diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 1cc72c0..fe39b3b 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -25,18 +25,14 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
 endif()
 
 macro(cmake_record_c_compile_features)
-  macro(_get_appleclang_features std_version list)
-    record_compiler_features(C "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)
-    _get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
+    _record_compiler_features_c(11)
     if (_result EQUAL 0)
-      _get_appleclang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
+      _record_compiler_features_c(99)
     endif()
     if (_result EQUAL 0)
-      _get_appleclang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
+      _record_compiler_features_c(90)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 95bc79a..8dd6278 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -36,21 +36,17 @@ endif()
 
 
 macro(cmake_record_cxx_compile_features)
-  macro(_get_appleclang_features std_version list)
-    record_compiler_features(CXX "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
     set(_result 0)
     if(CMAKE_CXX14_STANDARD_COMPILE_OPTION)
-      _get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
+      _record_compiler_features_cxx(14)
     endif()
     if (_result EQUAL 0)
-      _get_appleclang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
+      _record_compiler_features_cxx(11)
     endif()
     if (_result EQUAL 0)
-      _get_appleclang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
+      _record_compiler_features_cxx(98)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
index d8b7743..b3f3805 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -34,18 +34,14 @@ if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
 endif()
 
 macro(cmake_record_c_compile_features)
-  macro(_get_clang_features std_version list)
-    record_compiler_features(C "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
-    _get_clang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
+    _record_compiler_features_c(11)
     if (_result EQUAL 0)
-      _get_clang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
+      _record_compiler_features_c(99)
     endif()
     if (_result EQUAL 0)
-      _get_clang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
+      _record_compiler_features_c(90)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index dc62711..dfe0628 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -44,18 +44,14 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
 endif()
 
 macro(cmake_record_cxx_compile_features)
-  macro(_get_clang_features std_version list)
-    record_compiler_features(CXX "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
-    _get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
+    _record_compiler_features_cxx(14)
     if (_result EQUAL 0)
-      _get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
+      _record_compiler_features_cxx(11)
     endif()
     if (_result EQUAL 0)
-      _get_clang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
+      _record_compiler_features_cxx(98)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 2c478da..4dbf6ef 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -40,20 +40,16 @@ endif()
 
 
 macro(cmake_record_c_compile_features)
-  macro(_get_gcc_features std_version list)
-    record_compiler_features(C "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6)
-    _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
+    _record_compiler_features_c(11)
   endif()
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4)
     if (_result EQUAL 0)
-      _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
+      _record_compiler_features_c(99)
     endif()
     if (_result EQUAL 0)
-      _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
+      _record_compiler_features_c(90)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index e1c555b..936f62b 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -47,20 +47,16 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
 endif()
 
 macro(cmake_record_cxx_compile_features)
-  macro(_get_gcc_features std_version list)
-    record_compiler_features(CXX "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-    _get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
+    _record_compiler_features_cxx(14)
   endif()
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
     if (_result EQUAL 0)
-      _get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
+      _record_compiler_features_cxx(11)
     endif()
     if (_result EQUAL 0)
-      _get_gcc_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
+      _record_compiler_features_cxx(98)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 5815857..5a79452 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -47,20 +47,16 @@ unset(_std)
 unset(_ext)
 
 macro(cmake_record_c_compile_features)
-  macro(_get_intel_c_features std_version list)
-    record_compiler_features(C "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
     if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
-      _get_intel_c_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
+      _record_compiler_features_C(11)
     endif()
     if (_result EQUAL 0)
-      _get_intel_c_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
+      _record_compiler_features_C(99)
     endif()
     if (_result EQUAL 0)
-      _get_intel_c_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
+      _record_compiler_features_C(90)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index b6bc2ee..6673a2d 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -60,20 +60,16 @@ unset(_std)
 unset(_ext)
 
 macro(cmake_record_cxx_compile_features)
-  macro(_get_intel_features std_version list)
-    record_compiler_features(CXX "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
-      _get_intel_features("${CMAKE_CXX14_STANDARD_COMPILE_OPTION}" CMAKE_CXX14_COMPILE_FEATURES)
+      _record_compiler_features_cxx(14)
     endif()
     if (_result EQUAL 0)
-      _get_intel_features("${CMAKE_CXX11_STANDARD_COMPILE_OPTION}" CMAKE_CXX11_COMPILE_FEATURES)
+      _record_compiler_features_cxx(11)
     endif()
     if (_result EQUAL 0)
-      _get_intel_features("${CMAKE_CXX98_STANDARD_COMPILE_OPTION}" CMAKE_CXX98_COMPILE_FEATURES)
+      _record_compiler_features_cxx(98)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake
index 681ee70..82f15bd 100644
--- a/Modules/Compiler/MSVC-CXX.cmake
+++ b/Modules/Compiler/MSVC-CXX.cmake
@@ -6,6 +6,6 @@ endif()
 
 macro(cmake_record_cxx_compile_features)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
-    record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
+    _record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
   endif()
 endmacro()
diff --git a/Modules/Compiler/SunPro-CXX.cmake b/Modules/Compiler/SunPro-CXX.cmake
index ce01cdd..e83c896 100644
--- a/Modules/Compiler/SunPro-CXX.cmake
+++ b/Modules/Compiler/SunPro-CXX.cmake
@@ -32,6 +32,8 @@ set(CMAKE_CXX_CREATE_STATIC_LIBRARY
   "<CMAKE_RANLIB> <TARGET> ")
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+  set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
   set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
 endif()
@@ -49,15 +51,11 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
 endif()
 
 macro(cmake_record_cxx_compile_features)
-  macro(_get_solaris_studio_features std_version list)
-    record_compiler_features(CXX "${std_version}" ${list})
-  endmacro()
-
   set(_result 0)
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
-    _get_solaris_studio_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
+    _record_compiler_features_cxx(11)
     if (_result EQUAL 0)
-      _get_solaris_studio_features("" CMAKE_CXX98_COMPILE_FEATURES)
+      _record_compiler_features_cxx(98)
     endif()
   endif()
 endmacro()
diff --git a/Modules/Internal/FeatureTesting.cmake b/Modules/Internal/FeatureTesting.cmake
index 86b89b2..e94246e 100644
--- a/Modules/Internal/FeatureTesting.cmake
+++ b/Modules/Internal/FeatureTesting.cmake
@@ -1,5 +1,5 @@
 
-macro(record_compiler_features lang compile_flags feature_list)
+macro(_record_compiler_features lang compile_flags feature_list)
   include("${CMAKE_ROOT}/Modules/Compiler/${CMAKE_${lang}_COMPILER_ID}-${lang}-FeatureTests.cmake" OPTIONAL)
 
   string(TOLOWER ${lang} lang_lc)
@@ -58,3 +58,11 @@ macro(record_compiler_features lang compile_flags feature_list)
       "Detecting ${lang} [${compile_flags}] compiler features failed to compile with the following output:\n${_output}\n${_copy_error}\n\n")
   endif()
 endmacro()
+
+macro(_record_compiler_features_c std)
+  _record_compiler_features(C "${CMAKE_C${std}_STANDARD_COMPILE_OPTION}" CMAKE_C${std}_COMPILE_FEATURES)
+endmacro()
+
+macro(_record_compiler_features_cxx std)
+  _record_compiler_features(CXX "${CMAKE_CXX${std}_STANDARD_COMPILE_OPTION}" CMAKE_CXX${std}_COMPILE_FEATURES)
+endmacro()