Features: Record for SolarisStudio 12.4.
It has similar C++11 capabilities compared to GCC 4.8.
This commit is contained in:
Stephen Kelly
parent
536c535cb0
commit
bcb04783f7
|
|
@ -0,0 +1,52 @@
|
|||
|
||||
# Based on GNU 4.8.2
|
||||
# http://docs.oracle.com/cd/E37069_01/html/E37071/gncix.html
|
||||
# Reference: http://gcc.gnu.org/projects/cxx0x.html
|
||||
|
||||
set(_cmake_oldestSupported "__SUNPRO_CC >= 0x5130")
|
||||
|
||||
set(SolarisStudio124_CXX11 "(__SUNPRO_CC >= 0x5130) && __cplusplus >= 201103L")
|
||||
set(_cmake_feature_test_cxx_alignas "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_alignof "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_attributes "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_inheriting_constructors "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_thread_local "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_alias_templates "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_delegating_constructors "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_extended_friend_declarations "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_final "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_noexcept "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_nonstatic_member_init "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_override "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_constexpr "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_defaulted_move_initializers "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_enum_forward_declarations "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_nullptr "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_range_for "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_unrestricted_unions "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_explicit_conversions "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_lambdas "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_local_type_template_args "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_raw_string_literals "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_auto_type "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_defaulted_functions "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_deleted_functions "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_generalized_initializers "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_inline_namespaces "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_sizeof_member "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_strong_enums "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_trailing_return_types "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_unicode_literals "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_uniform_initialization "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_variadic_templates "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_decltype "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_default_function_template_args "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_long_long_type "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_right_angle_brackets "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_rvalue_references "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_static_assert "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_extern_templates "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_func_identifier "${SolarisStudio124_CXX11}")
|
||||
set(_cmake_feature_test_cxx_variadic_macros "${SolarisStudio124_CXX11}")
|
||||
|
||||
set(_cmake_feature_test_cxx_template_template_parameters "${_cmake_oldestSupported} && __cplusplus")
|
||||
|
|
@ -31,3 +31,24 @@ set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -
|
|||
set(CMAKE_CXX_CREATE_STATIC_LIBRARY
|
||||
"<CMAKE_CXX_COMPILER> -xar -o <TARGET> <OBJECTS> "
|
||||
"<CMAKE_RANLIB> <TARGET> ")
|
||||
|
||||
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()
|
||||
|
||||
set(CMAKE_CXX_STANDARD_DEFAULT 98)
|
||||
|
||||
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)
|
||||
if (_result EQUAL 0)
|
||||
_get_solaris_studio_features("" CMAKE_CXX98_COMPILE_FEATURES)
|
||||
endif()
|
||||
endif()
|
||||
endmacro()
|
||||
|
|
|
|||
|
|
@ -321,6 +321,7 @@ function(write_compiler_detection_header
|
|||
GNU
|
||||
Clang
|
||||
AppleClang
|
||||
SunPro
|
||||
)
|
||||
|
||||
set(_hex_compilers ADSP Borland Embarcadero SunPro)
|
||||
|
|
|
|||
|
|
@ -51,6 +51,17 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
|
|||
)
|
||||
endif()
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
|
||||
list(REMOVE_ITEM CXX_non_features
|
||||
cxx_attribute_deprecated
|
||||
cxx_contextual_conversions
|
||||
cxx_extended_friend_declarations
|
||||
cxx_long_long_type
|
||||
cxx_sizeof_member
|
||||
cxx_variadic_macros
|
||||
)
|
||||
endif()
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
|
||||
AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
|
||||
# The cxx_alignof feature happens to work (for *this* testcase) with
|
||||
|
|
@ -188,6 +199,13 @@ if (CMAKE_CXX_COMPILE_FEATURES)
|
|||
-DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=0
|
||||
)
|
||||
endif()
|
||||
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
|
||||
add_definitions(
|
||||
-DEXPECT_OVERRIDE_CONTROL=1
|
||||
-DEXPECT_INHERITING_CONSTRUCTORS=1
|
||||
-DEXPECT_FINAL=1
|
||||
-DEXPECT_INHERITING_CONSTRUCTORS_AND_FINAL=1
|
||||
)
|
||||
endif()
|
||||
|
||||
add_executable(CompileFeaturesGenex genex_test.cpp)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ get_property(c_known_features GLOBAL PROPERTY CMAKE_C_KNOWN_FEATURES)
|
|||
write_compiler_detection_header(
|
||||
FILE "${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h"
|
||||
PREFIX TEST
|
||||
COMPILERS GNU Clang AppleClang
|
||||
COMPILERS GNU Clang AppleClang SunPro
|
||||
VERSION 3.1
|
||||
PROLOG "// something"
|
||||
EPILOG "// more"
|
||||
|
|
@ -58,7 +58,8 @@ endmacro()
|
|||
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
|
||||
# False for C++98 mode.
|
||||
list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
|
||||
list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
|
||||
|
|
@ -81,7 +82,7 @@ write_compiler_detection_header(
|
|||
PREFIX MULTI
|
||||
OUTPUT_FILES_VAR multi_files
|
||||
OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/compiler_multi_files/compiler_support"
|
||||
COMPILERS GNU Clang AppleClang
|
||||
COMPILERS GNU Clang AppleClang SunPro
|
||||
VERSION 3.1
|
||||
FEATURES
|
||||
${cxx_known_features} ${c_known_features}
|
||||
|
|
|
|||
Loading…
Reference in New Issue