[Cmake-commits] CMake branch, next, updated. v3.1.0-1266-g7b44de8
Stephen Kelly
steveire at gmail.com
Fri Dec 19 02:49:17 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7b44de887d93ce747a8afcfbf8ad4a8691895261 (commit)
via feb71a03a8fe6fceade6974d907855cf2b64595a (commit)
from 6213867925e250e12d4143dbabc26842a7f2c83e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b44de887d93ce747a8afcfbf8ad4a8691895261
commit 7b44de887d93ce747a8afcfbf8ad4a8691895261
Merge: 6213867 feb71a0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 19 02:49:14 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 19 02:49:14 2014 -0500
Merge topic 'AppleClang-5.1-features' into next
feb71a03 Revert "Features: Record for AppleClang."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=feb71a03a8fe6fceade6974d907855cf2b64595a
commit feb71a03a8fe6fceade6974d907855cf2b64595a
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 19 08:48:38 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Dec 19 08:48:38 2014 +0100
Revert "Features: Record for AppleClang."
This reverts commit 7c346ae68c4094d1b97f564d86f41c118285c345.
diff --git a/Modules/Compiler/AppleClang-C-FeatureTests.cmake b/Modules/Compiler/AppleClang-C-FeatureTests.cmake
deleted file mode 100644
index ec1d43f..0000000
--- a/Modules/Compiler/AppleClang-C-FeatureTests.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-
-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}")
diff --git a/Modules/Compiler/AppleClang-C.cmake b/Modules/Compiler/AppleClang-C.cmake
index 10edc74..98fcd0b 100644
--- a/Modules/Compiler/AppleClang-C.cmake
+++ b/Modules/Compiler/AppleClang-C.cmake
@@ -1,33 +1,2 @@
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()
diff --git a/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake b/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
deleted file mode 100644
index 78bdb72..0000000
--- a/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# 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}")
diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index eb97f88..c1acae6 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -4,34 +4,3 @@ __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()
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index 36b9706..0b6f0de 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -100,7 +100,7 @@
# write_compiler_detection_header(
# FILE climbingstats_compiler_detection.h
# PREFIX ClimbingStats
-# COMPILERS GNU Clang AppleClang
+# COMPILERS GNU Clang
# FEATURES cxx_variadic_templates
# )
#
@@ -315,7 +315,6 @@ function(write_compiler_detection_header
set(compilers
GNU
Clang
- AppleClang
)
set(_hex_compilers ADSP Borland Embarcadero SunPro)
@@ -514,7 +513,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 || ${prefix_arg}_COMPILER_IS_AppleClang
+# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
# define ${def_value} __attribute__ ((__aligned__(X)))
# else
# define ${def_value}
@@ -526,7 +525,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 || ${prefix_arg}_COMPILER_IS_AppleClang
+# elif ${prefix_arg}_COMPILER_IS_GNU || ${prefix_arg}_COMPILER_IS_Clang
# define ${def_value} __alignof__(X)
# endif
\n")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/AppleClang-C-FeatureTests.cmake | 11 -------
Modules/Compiler/AppleClang-C.cmake | 31 --------------------
Modules/Compiler/AppleClang-CXX-FeatureTests.cmake | 31 --------------------
Modules/Compiler/AppleClang-CXX.cmake | 31 --------------------
Modules/WriteCompilerDetectionHeader.cmake | 7 ++---
5 files changed, 3 insertions(+), 108 deletions(-)
delete mode 100644 Modules/Compiler/AppleClang-C-FeatureTests.cmake
delete mode 100644 Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list