Features: Record for AppleClang 5.1
Apple's Clang 5.1 already supports most of the C and C++ features CMake enumerates.
This commit is contained in:
Stephen Kelly
Brad King
parent
b341799e53
commit
bd6b42c186
|
|
@ -0,0 +1,11 @@
|
|||
|
||||
set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 501")
|
||||
|
||||
set(AppleClang_C11 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L")
|
||||
set(_cmake_feature_test_c_static_assert "${AppleClang_C11}")
|
||||
set(AppleClang_C99 "${_cmake_oldestSupported} && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
|
||||
set(_cmake_feature_test_c_restrict "${AppleClang_C99}")
|
||||
set(_cmake_feature_test_c_variadic_macros "${AppleClang_C99}")
|
||||
|
||||
set(AppleClang_C90 "${_cmake_oldestSupported} && !defined(__STDC_VERSION__)")
|
||||
set(_cmake_feature_test_c_function_prototypes "${AppleClang_C90}")
|
||||
|
|
@ -1,2 +1,33 @@
|
|||
include(Compiler/Clang)
|
||||
__compiler_clang(C)
|
||||
|
||||
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.1)
|
||||
set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
|
||||
set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
|
||||
|
||||
set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
|
||||
set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
|
||||
|
||||
set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
|
||||
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
|
||||
endif()
|
||||
|
||||
set(CMAKE_C_STANDARD_DEFAULT 99)
|
||||
|
||||
macro(cmake_record_c_compile_features)
|
||||
macro(_get_appleclang_features std_version list)
|
||||
record_compiler_features(C "${std_version}" ${list})
|
||||
endmacro()
|
||||
|
||||
if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.1)
|
||||
_get_appleclang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
|
||||
if (_result EQUAL 0)
|
||||
_get_appleclang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
|
||||
endif()
|
||||
if (_result EQUAL 0)
|
||||
_get_appleclang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
|
||||
endif()
|
||||
else()
|
||||
set(_result 0)
|
||||
endif()
|
||||
endmacro()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
|
||||
# No known reference for AppleClang versions.
|
||||
# Generic reference: http://clang.llvm.org/cxx_status.html
|
||||
# http://clang.llvm.org/docs/LanguageExtensions.html
|
||||
|
||||
set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 501")
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/Clang-CXX-TestableFeatures.cmake")
|
||||
|
||||
set(AppleClang51_CXX14 "((__clang_major__ * 100) + __clang_minor__) >= 501 && __cplusplus > 201103L")
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=19242
|
||||
set(_cmake_feature_test_cxx_attribute_deprecated "${AppleClang51_CXX14}")
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=19698
|
||||
set(_cmake_feature_test_cxx_decltype_auto "${AppleClang51_CXX14}")
|
||||
set(_cmake_feature_test_cxx_digit_separators "${AppleClang51_CXX14}")
|
||||
# http://llvm.org/bugs/show_bug.cgi?id=19674
|
||||
set(_cmake_feature_test_cxx_generic_lambdas "${AppleClang51_CXX14}")
|
||||
|
||||
set(AppleClang51_CXX11 "${_cmake_oldestSupported} && __cplusplus >= 201103L")
|
||||
set(_cmake_feature_test_cxx_enum_forward_declarations "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_sizeof_member "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_extended_friend_declarations "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_extern_templates "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_func_identifier "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_inline_namespaces "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_long_long_type "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_right_angle_brackets "${AppleClang51_CXX11}")
|
||||
set(_cmake_feature_test_cxx_variadic_macros "${AppleClang51_CXX11}")
|
||||
|
||||
set(AppleClang_CXX98 "${_cmake_oldestSupported} && __cplusplus >= 199711L")
|
||||
set(_cmake_feature_test_cxx_template_template_parameters "${AppleClang_CXX98}")
|
||||
|
|
@ -4,3 +4,34 @@ __compiler_clang(CXX)
|
|||
if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
|
||||
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
|
||||
endif()
|
||||
|
||||
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
|
||||
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
|
||||
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
|
||||
|
||||
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
|
||||
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
|
||||
|
||||
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
|
||||
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
|
||||
endif()
|
||||
|
||||
set(CMAKE_CXX_STANDARD_DEFAULT 98)
|
||||
|
||||
macro(cmake_record_cxx_compile_features)
|
||||
macro(_get_appleclang_features std_version list)
|
||||
record_compiler_features(CXX "${std_version}" ${list})
|
||||
endmacro()
|
||||
|
||||
if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
|
||||
_get_appleclang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
|
||||
if (_result EQUAL 0)
|
||||
_get_appleclang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
|
||||
endif()
|
||||
if (_result EQUAL 0)
|
||||
_get_appleclang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
|
||||
endif()
|
||||
else()
|
||||
set(_result 0)
|
||||
endif()
|
||||
endmacro()
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@
|
|||
# write_compiler_detection_header(
|
||||
# FILE climbingstats_compiler_detection.h
|
||||
# PREFIX ClimbingStats
|
||||
# COMPILERS GNU Clang
|
||||
# COMPILERS GNU Clang AppleClang
|
||||
# FEATURES cxx_variadic_templates
|
||||
# )
|
||||
#
|
||||
|
|
@ -315,6 +315,7 @@ function(write_compiler_detection_header
|
|||
set(compilers
|
||||
GNU
|
||||
Clang
|
||||
AppleClang
|
||||
)
|
||||
|
||||
set(_hex_compilers ADSP Borland Embarcadero SunPro)
|
||||
|
|
@ -513,7 +514,7 @@ function(write_compiler_detection_header
|
|||
set(file_content "${file_content}
|
||||
# if ${def_name}
|
||||
# define ${def_value} alignas(X)
|
||||
# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
|
||||
# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
|
||||
# define ${def_value} __attribute__ ((__aligned__(X)))
|
||||
# else
|
||||
# define ${def_value}
|
||||
|
|
@ -525,7 +526,7 @@ function(write_compiler_detection_header
|
|||
set(file_content "${file_content}
|
||||
# if ${def_name}
|
||||
# define ${def_value} alignof(X)
|
||||
# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
|
||||
# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang || ${prefix_arg}_COMPILER_IS_AppleClang
|
||||
# define ${def_value} __alignof__(X)
|
||||
# endif
|
||||
\n")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
COMPILERS GNU Clang AppleClang
|
||||
VERSION 3.1
|
||||
PROLOG "// something"
|
||||
EPILOG "// more"
|
||||
|
|
@ -57,14 +57,16 @@ macro(set_defines target true_defs false_defs)
|
|||
endmacro()
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL Clang
|
||||
OR CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
|
||||
# False for C++98 mode.
|
||||
list(APPEND false_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS)
|
||||
list(APPEND false_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES)
|
||||
endif()
|
||||
|
||||
if (CMAKE_C_COMPILER_ID STREQUAL GNU
|
||||
OR CMAKE_C_COMPILER_ID STREQUAL Clang)
|
||||
OR CMAKE_C_COMPILER_ID STREQUAL Clang
|
||||
OR CMAKE_C_COMPILER_ID STREQUAL AppleClang)
|
||||
add_executable(C_undefined c_undefined.c)
|
||||
set_property(TARGET C_undefined PROPERTY CXX_STANDARD 90)
|
||||
target_compile_options(C_undefined PRIVATE -Werror=undef)
|
||||
|
|
@ -79,7 +81,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
|
||||
COMPILERS GNU Clang AppleClang
|
||||
VERSION 3.1
|
||||
FEATURES
|
||||
${cxx_known_features} ${c_known_features}
|
||||
|
|
|
|||
Loading…
Reference in New Issue