mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

CompilerID: Rename language_dialect to language_standard

Browse Source 
In Linux C++ terms dialect usually refers to having GNU extensions or not.
Change the name to better reflect that this is about the standard version.
This commit is contained in:
Raul Tambre
2021-05-29 16:10:36 +03:00
parent 00055d7779
commit 2adfd95d79
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/CMakeCCompilerId.c.in
View File

@@ -41,23 +41,23 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
#if !defined(__STDC__) && !defined(__clang__)
# if defined(_MSC_VER) || defined(__ibmxl__) || defined(__IBMC__)
# define C_DIALECT "90"
# define C_VERSION "90"
# else
# define C_DIALECT
# define C_VERSION
# endif
#elif __STDC_VERSION__ > 201710L
# define C_DIALECT "23"
# define C_VERSION "23"
#elif __STDC_VERSION__ >= 201710L
# define C_DIALECT "17"
# define C_VERSION "17"
#elif __STDC_VERSION__ >= 201000L
# define C_DIALECT "11"
# define C_VERSION "11"
#elif __STDC_VERSION__ >= 199901L
# define C_DIALECT "99"
# define C_VERSION "99"
#else
# define C_DIALECT "90"
# define C_VERSION "90"
#endif
const char* info_language_dialect_default =
"INFO" ":" "dialect_default[" C_DIALECT "]";
const char* info_language_standard_default =
"INFO" ":" "standard_default[" C_VERSION "]";
/*--------------------------------------------------------------------------*/
@@ -89,7 +89,7 @@ int main(int argc, char* argv[])
#if defined(__CRAYXT_COMPUTE_LINUX_TARGET)
require += info_cray[argc];
#endif
require += info_language_dialect_default[argc];
require += info_language_standard_default[argc];
(void)argv;
return require;
}

4
Modules/CMakeCUDACompilerId.cu.in
View File

@@ -16,7 +16,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
@CMAKE_CUDA_COMPILER_ID_PLATFORM_CONTENT@
@CMAKE_CUDA_COMPILER_ID_ERROR_FOR_TEST@
const char* info_language_dialect_default = "INFO" ":" "dialect_default["
const char* info_language_standard_default = "INFO" ":" "standard_default["
#if __cplusplus > 202002L
"23"
#elif __cplusplus > 201703L
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
#ifdef SIMULATE_VERSION_MAJOR
require += info_simulate_version[argc];
#endif
require += info_language_dialect_default[argc];
require += info_language_standard_default[argc];
(void)argv;
return require;
}

4
Modules/CMakeCXXCompilerId.cpp.in
View File

@@ -49,7 +49,7 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
# define CXX_STD __cplusplus
#endif
const char* info_language_dialect_default = "INFO" ":" "dialect_default["
const char* info_language_standard_default = "INFO" ":" "standard_default["
#if CXX_STD > 202002L
"23"
#elif CXX_STD > 201703L
@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
#if defined(__CRAYXT_COMPUTE_LINUX_TARGET)
require += info_cray[argc];
#endif
require += info_language_dialect_default[argc];
require += info_language_standard_default[argc];
(void)argv;
return require;
}

2
Modules/CMakeDetermineCompilerId.cmake
View File

@@ -881,7 +881,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
if("${info}" MATCHES "INFO:qnxnto\\[\\]")
set(COMPILER_QNXNTO 1)
endif()
if("${info}" MATCHES "INFO:dialect_default\\[([^]\"]*)\\]")
if("${info}" MATCHES "INFO:standard_default\\[([^]\"]*)\\]")
set(CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT "${CMAKE_MATCH_1}")
endif()
endforeach()

4
Modules/CMakeHIPCompilerId.hip.in
View File

@@ -16,7 +16,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
@CMAKE_HIP_COMPILER_ID_PLATFORM_CONTENT@
@CMAKE_HIP_COMPILER_ID_ERROR_FOR_TEST@
const char* info_language_dialect_default = "INFO" ":" "dialect_default["
const char* info_language_standard_default = "INFO" ":" "standard_default["
#if __cplusplus > 202002L
"23"
#elif __cplusplus > 201703L
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
#ifdef SIMULATE_VERSION_MAJOR
require += info_simulate_version[argc];
#endif
require += info_language_dialect_default[argc];
require += info_language_standard_default[argc];
(void)argv;
return require;
}

20
Modules/CMakeOBJCCompilerId.m.in
View File

@@ -23,23 +23,23 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
#if !defined(__STDC__)
# if (defined(_MSC_VER) && !defined(__clang__)) \
|| (defined(__ibmxl__) || defined(__IBMC__))
# define C_DIALECT "90"
# define C_VERSION "90"
# else
# define C_DIALECT
# define C_VERSION
# endif
#elif __STDC_VERSION__ > 201710L
# define C_DIALECT "23"
# define C_VERSION "23"
#elif __STDC_VERSION__ >= 201710L
# define C_DIALECT "17"
# define C_VERSION "17"
#elif __STDC_VERSION__ >= 201000L
# define C_DIALECT "11"
# define C_VERSION "11"
#elif __STDC_VERSION__ >= 199901L
# define C_DIALECT "99"
# define C_VERSION "99"
#else
# define C_DIALECT "90"
# define C_VERSION "90"
#endif
const char* info_language_dialect_default =
"INFO" ":" "dialect_default[" C_DIALECT "]";
const char* info_language_standard_default =
"INFO" ":" "standard_default[" C_VERSION "]";
/*--------------------------------------------------------------------------*/
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
#ifdef SIMULATE_VERSION_MAJOR
require += info_simulate_version[argc];
#endif
require += info_language_dialect_default[argc];
require += info_language_standard_default[argc];
(void)argv;
return require;
}

4
Modules/CMakeOBJCXXCompilerId.mm.in
View File

@@ -29,7 +29,7 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
#define CXX_STD __cplusplus
#endif
const char* info_language_dialect_default = "INFO" ":" "dialect_default["
const char* info_language_standard_default = "INFO" ":" "standard_default["
#if CXX_STD > 202002L
"23"
#elfif CXX_STD > 201703L
@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
#ifdef SIMULATE_VERSION_MAJOR
require += info_simulate_version[argc];
#endif
require += info_language_dialect_default[argc];
require += info_language_standard_default[argc];
(void)argv;
return require;
}