diff options
author | Brad King <brad.king@kitware.com> | 2016-11-02 13:42:39 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-11-02 13:51:48 (GMT) |
commit | 8b6cc2518a8019314af43a32702a09bff318b777 (patch) | |
tree | b662bd6f006143d11874b1ede76b430be13c5da2 /Modules/Compiler/SunPro-CXX.cmake | |
parent | 2d23f7b206c908e55999143487548e2d6a92bc79 (diff) | |
download | CMake-8b6cc2518a8019314af43a32702a09bff318b777.zip CMake-8b6cc2518a8019314af43a32702a09bff318b777.tar.gz CMake-8b6cc2518a8019314af43a32702a09bff318b777.tar.bz2 |
Features: Centralize per-compiler recording macros
Simplify and de-duplicate per-compiler feature recording macros and
convert to a centralized per-language macro.
Diffstat (limited to 'Modules/Compiler/SunPro-CXX.cmake')
-rw-r--r-- | Modules/Compiler/SunPro-CXX.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
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() |