mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 22:50:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

CompilerId: Clarify C and C++ standard level detection

Browse Source 
Use named constants.  Regularize comparison patterns.
This commit is contained in:
Brad King
2024-04-02 16:50:51 -04:00
parent ae18811f2e
commit b9d4db7098
4 changed files with 60 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Tests/CompileFeatures/default_dialect.cpp
View File

@@ -2,15 +2,23 @@
template <long l>
struct Outputter;
#if defined(__INTEL_COMPILER) && defined(_MSVC_LANG) && _MSVC_LANG < 201403L
#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
#if defined(__INTEL_COMPILER) && defined(_MSVC_LANG) && \
_MSVC_LANG <= CXX_STD_14
# if defined(__INTEL_CXX11_MODE__)
# if defined(__cpp_aggregate_nsdmi)
# define CXX_STD 201402L
# define CXX_STD CXX_STD_14
# else
# define CXX_STD 201103L
# define CXX_STD CXX_STD_11
# endif
# else
# define CXX_STD 199711L
# define CXX_STD CXX_STD_98
# endif
#elif defined(_MSC_VER) && defined(_MSVC_LANG)
# define CXX_STD _MSVC_LANG
@@ -19,30 +27,30 @@ struct Outputter;
#endif
#if DEFAULT_CXX23
# if CXX_STD <= 202002L
# if CXX_STD <= CXX_STD_20
Outputter<CXX_STD> o;
# endif
#elif DEFAULT_CXX20
# if CXX_STD <= 201703L
# if CXX_STD <= CXX_STD_17
Outputter<CXX_STD> o;
# endif
#elif DEFAULT_CXX17
# if CXX_STD <= 201402L
# if CXX_STD <= CXX_STD_14
Outputter<CXX_STD> o;
# endif
#elif DEFAULT_CXX14
# if CXX_STD != 201402L
# if CXX_STD <= CXX_STD_11
Outputter<CXX_STD> o;
# endif
#elif DEFAULT_CXX11
# if CXX_STD != 201103L
# if CXX_STD != CXX_STD_11
Outputter<CXX_STD> o;
# endif
#else
# if !DEFAULT_CXX98
# error Buildsystem error
# endif
# if CXX_STD != 199711L && CXX_STD != 1 && \
# if CXX_STD != CXX_STD_98 && CXX_STD != 1 && \
!defined(__GXX_EXPERIMENTAL_CXX0X__)
Outputter<CXX_STD> o;
# endif