CompilerId: Clarify CUDA, HIP, ObjC, ObjC++ standard level detection

Use named constants.  Regularize comparison patterns.  Follow the
approach from commit b9d4db7098 (CompilerId: Clarify C and C++ standard
level detection, 2024-04-02).
This commit is contained in:
Brad King committed 2024-04-16 15:31:36 -04:00
1 parent cf457fbf9c
commit dcbc2ef00d
4 files changed
+52 -19

No files matched your search

+13 -5
View File
@@ -16,16 +16,24 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
@CMAKE_CUDA_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_CUDA_COMPILER_ID_PLATFORM_CONTENT@
@CMAKE_CUDA_COMPILER_ID_ERROR_FOR_TEST@ @CMAKE_CUDA_COMPILER_ID_ERROR_FOR_TEST@
#define CXX_STD_11 201103L
#define CXX_STD_14 201402L
#define CXX_STD_17 201703L
#define CXX_STD_20 202002L
#define CXX_STD_23 202302L
#define CXX_STD __cplusplus
const char* info_language_standard_default = "INFO" ":" "standard_default[" const char* info_language_standard_default = "INFO" ":" "standard_default["
#if __cplusplus > 202002L #if CXX_STD > CXX_STD_20
"23" "23"
#elif __cplusplus > 201703L #elif CXX_STD > CXX_STD_17
"20" "20"
#elif __cplusplus >= 201703L #elif CXX_STD > CXX_STD_14
"17" "17"
#elif __cplusplus >= 201402L #elif CXX_STD > CXX_STD_11
"14" "14"
#elif __cplusplus >= 201103L #elif CXX_STD >= CXX_STD_11
"11" "11"
#else #else
"03" "03"
+14 -5
View File
@@ -16,16 +16,25 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
@CMAKE_HIP_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_HIP_COMPILER_ID_PLATFORM_CONTENT@
@CMAKE_HIP_COMPILER_ID_ERROR_FOR_TEST@ @CMAKE_HIP_COMPILER_ID_ERROR_FOR_TEST@
#define CXX_STD_98 199711L
#define CXX_STD_11 201103L
#define CXX_STD_14 201402L
#define CXX_STD_17 201703L
#define CXX_STD_20 202002L
#define CXX_STD_23 202302L
#define CXX_STD __cplusplus
const char* info_language_standard_default = "INFO" ":" "standard_default[" const char* info_language_standard_default = "INFO" ":" "standard_default["
#if __cplusplus > 202002L #if CXX_STD > CXX_STD_20
"23" "23"
#elif __cplusplus > 201703L #elif CXX_STD > CXX_STD_17
"20" "20"
#elif __cplusplus >= 201703L #elif CXX_STD > CXX_STD_14
"17" "17"
#elif __cplusplus >= 201402L #elif CXX_STD > CXX_STD_11
"14" "14"
#elif __cplusplus >= 201103L #elif CXX_STD >= CXX_STD_11
"11" "11"
#else #else
"98" "98"
+13 -4
View File
@@ -20,19 +20,28 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
@CMAKE_OBJC_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_OBJC_COMPILER_ID_PLATFORM_CONTENT@
@CMAKE_OBJC_COMPILER_ID_ERROR_FOR_TEST@ @CMAKE_OBJC_COMPILER_ID_ERROR_FOR_TEST@
#define C_STD_99 199901L
#define C_STD_11 201112L
#define C_STD_17 201710L
#define C_STD_23 202311L
#ifdef __STDC_VERSION__
# define C_STD __STDC_VERSION__
#endif
#if !defined(__STDC__) #if !defined(__STDC__)
# if defined(__ibmxl__) || defined(__IBMC__) # if defined(__ibmxl__) || defined(__IBMC__)
# define C_VERSION "90" # define C_VERSION "90"
# else # else
# define C_VERSION # define C_VERSION
# endif # endif
#elif __STDC_VERSION__ > 201710L #elif C_STD > C_STD_17
# define C_VERSION "23" # define C_VERSION "23"
#elif __STDC_VERSION__ >= 201710L #elif C_STD > C_STD_11
# define C_VERSION "17" # define C_VERSION "17"
#elif __STDC_VERSION__ >= 201000L #elif C_STD > C_STD_99
# define C_VERSION "11" # define C_VERSION "11"
#elif __STDC_VERSION__ >= 199901L #elif C_STD >= C_STD_99
# define C_VERSION "99" # define C_VERSION "99"
#else #else
# define C_VERSION "90" # define C_VERSION "90"
+12 -5
View File
@@ -23,18 +23,25 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
@CMAKE_OBJCXX_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_OBJCXX_COMPILER_ID_PLATFORM_CONTENT@
@CMAKE_OBJCXX_COMPILER_ID_ERROR_FOR_TEST@ @CMAKE_OBJCXX_COMPILER_ID_ERROR_FOR_TEST@
#define CXX_STD_98 199711L
#define CXX_STD_11 201103L
#define CXX_STD_14 201402L
#define CXX_STD_17 201703L
#define CXX_STD_20 202002L
#define CXX_STD_23 202302L
#define CXX_STD __cplusplus #define CXX_STD __cplusplus
const char* info_language_standard_default = "INFO" ":" "standard_default[" const char* info_language_standard_default = "INFO" ":" "standard_default["
#if CXX_STD > 202002L #if CXX_STD > CXX_STD_20
"23" "23"
#elif CXX_STD > 201703L #elif CXX_STD > CXX_STD_17
"20" "20"
#elif CXX_STD >= 201703L #elif CXX_STD > CXX_STD_14
"17" "17"
#elif CXX_STD >= 201402L #elif CXX_STD > CXX_STD_11
"14" "14"
#elif CXX_STD >= 201103L #elif CXX_STD >= CXX_STD_11
"11" "11"
#else #else
"98" "98"