|
|
@@ -31,21 +31,17 @@ set(CMAKE_CXX_CREATE_STATIC_LIBRARY
|
|
|
"<CMAKE_CXX_COMPILER> -xar -o <TARGET> <OBJECTS> "
|
|
|
"<CMAKE_RANLIB> <TARGET> ")
|
|
|
|
|
|
-if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
|
|
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
|
|
|
- set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++03")
|
|
|
- set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=c++03")
|
|
|
- set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
|
|
|
- set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
|
|
|
- endif()
|
|
|
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
|
|
|
+ set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
|
|
|
+ set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=c++11")
|
|
|
+endif()
|
|
|
|
|
|
- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
|
|
|
- if (NOT CMAKE_CXX_COMPILER_FORCED)
|
|
|
- if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
|
|
|
- message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}")
|
|
|
- endif()
|
|
|
- set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
|
|
|
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
|
|
|
+ if (NOT CMAKE_CXX_COMPILER_FORCED)
|
|
|
+ if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
|
|
|
+ message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version ${CMAKE_CXX_COMPILER_VERSION}")
|
|
|
endif()
|
|
|
+ set(CMAKE_CXX_STANDARD_DEFAULT ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT})
|
|
|
endif()
|
|
|
endif()
|
|
|
|
|
|
@@ -55,12 +51,10 @@ macro(cmake_record_cxx_compile_features)
|
|
|
endmacro()
|
|
|
|
|
|
set(_result 0)
|
|
|
- if (CMAKE_SYSTEM_NAME STREQUAL Linux)
|
|
|
- if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
|
|
|
- _get_solaris_studio_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
|
|
|
- if (_result EQUAL 0)
|
|
|
- _get_solaris_studio_features("" CMAKE_CXX98_COMPILE_FEATURES)
|
|
|
- endif()
|
|
|
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
|
|
|
+ _get_solaris_studio_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
|
|
|
+ if (_result EQUAL 0)
|
|
|
+ _get_solaris_studio_features("" CMAKE_CXX98_COMPILE_FEATURES)
|
|
|
endif()
|
|
|
endif()
|
|
|
endmacro()
|