[Cmake-commits] CMake branch, next, updated. v2.8.12-4376-geab8b07
Stephen Kelly
steveire at gmail.com
Wed Oct 23 18:19:26 EDT 2013
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 eab8b072f244bbf05633793a11c1d9d8e639a240 (commit)
via c33254dab7f519043b970edba037ab57444dc88b (commit)
from eb685cc5086741fd91d9d8aa56a8893760ec3f0b (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=eab8b072f244bbf05633793a11c1d9d8e639a240
commit eab8b072f244bbf05633793a11c1d9d8e639a240
Merge: eb685cc c33254d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 23 18:19:24 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 23 18:19:24 2013 -0400
Merge topic 'target_compiler_features' into next
c33254d Record the compilers capable of the cxx_delegating_constructors feature.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c33254dab7f519043b970edba037ab57444dc88b
commit c33254dab7f519043b970edba037ab57444dc88b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 17 11:47:29 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Oct 24 00:18:38 2013 +0200
Record the compilers capable of the cxx_delegating_constructors feature.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 7d9503c..2b320ca 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -5,28 +5,30 @@ if(NOT CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
endif()
+set(CMAKE_CXX11_COMPILER_FEATURES)
+
+include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
+
+macro(_get_clang_features std_version list)
+ record_cxx_compiler_features("-std=${std_version}" ${list})
+endmacro()
+
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.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++0x")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
+
+ _get_clang_features(c++0x CMAKE_CXX11_COMPILER_FEATURES)
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-endif()
-set(CMAKE_CXX11_COMPILER_FEATURES)
-
-include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
-
-macro(_get_clang_features std_version list)
- record_cxx_compiler_features("-std=${std_version}" ${list})
-endmacro()
-
-_get_clang_features(c++11 CMAKE_CXX11_COMPILER_FEATURES)
+ _get_clang_features(c++11 CMAKE_CXX11_COMPILER_FEATURES)
+endif()
unset(testable_features)
diff --git a/Modules/Compiler/Clang-features.cmake b/Modules/Compiler/Clang-features.cmake
index 012502d..074e5a1 100644
--- a/Modules/Compiler/Clang-features.cmake
+++ b/Modules/Compiler/Clang-features.cmake
@@ -1,6 +1,4 @@
-set(compiler_test_macro __clang__)
-
set(testable_features
cxx_delegating_constructors
)
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 32ca283..d60d60d 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -11,6 +11,14 @@ else()
endif()
endif()
+set(CMAKE_CXX11_COMPILER_FEATURES)
+
+include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
+
+macro(_get_gcc_features std_version list)
+ record_cxx_compiler_features("-std=${std_version}" ${list})
+endmacro()
+
# Appropriate version?
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
@@ -20,20 +28,14 @@ endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
+
+ _get_gcc_features(c++11 CMAKE_CXX11_COMPILER_FEATURES)
elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
-endif()
-set(CMAKE_CXX11_COMPILER_FEATURES)
-
-include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
-
-macro(_get_gcc_features std_version list)
- record_cxx_compiler_features("-std=${std_version}" ${list})
-endmacro()
-
-_get_gcc_features(c++11 CMAKE_CXX11_COMPILER_FEATURES)
+ _get_gcc_features(c++0x CMAKE_CXX11_COMPILER_FEATURES)
+endif()
set(CMAKE_CXX_COMPILER_FEATURES
${CMAKE_CXX11_COMPILER_FEATURES}
diff --git a/Modules/Compiler/GNU-features.cmake b/Modules/Compiler/GNU-features.cmake
index 169a6a9..bb63250 100644
--- a/Modules/Compiler/GNU-features.cmake
+++ b/Modules/Compiler/GNU-features.cmake
@@ -1,4 +1,2 @@
-set(compiler_test_macro __GNUC__)
-
set(feature_test_cxx_delegating_constructors "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 764c5d6..1eda76e 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -15,11 +15,14 @@ set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S
set(CMAKE_CXX11_COMPILER_FEATURES)
+include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.1)
if (CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "/Qstd=c++0x")
else()
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
+ record_cxx_compiler_features("-std=c++0x" CMAKE_CXX11_COMPILER_FEATURES)
# TODO: Does intel support GNU extensions and -std=gnu++0x etc?
endif()
endif()
@@ -29,15 +32,10 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "/Qstd=c++11")
else()
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
+ record_cxx_compiler_features("-std=c++11" CMAKE_CXX11_COMPILER_FEATURES)
endif()
endif()
-set(CMAKE_CXX11_COMPILER_FEATURES)
-
-include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
-
-record_cxx_compiler_features("-std=c++11" CMAKE_CXX11_COMPILER_FEATURES)
-
set(CMAKE_CXX_COMPILER_FEATURES
${CMAKE_CXX11_COMPILER_FEATURES}
)
diff --git a/Modules/Compiler/Intel-features.cmake b/Modules/Compiler/Intel-features.cmake
index b074912..07676a0 100644
--- a/Modules/Compiler/Intel-features.cmake
+++ b/Modules/Compiler/Intel-features.cmake
@@ -1,4 +1,2 @@
-set(compiler_test_macro __INTEL_COMPILER)
-
set(feature_test_cxx_delegating_constructors "__INTEL_COMPILER >= 1400")
diff --git a/Modules/Compiler/XL-CXX.cmake b/Modules/Compiler/XL-CXX.cmake
index c289a27..706b789 100644
--- a/Modules/Compiler/XL-CXX.cmake
+++ b/Modules/Compiler/XL-CXX.cmake
@@ -12,15 +12,13 @@ set(CMAKE_CXX_COMPILE_OBJECT
set(CMAKE_CXX11_COMPILER_FEATURES)
+include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
+
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.1)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-qlanglvl=extended0x")
+ record_cxx_compiler_features("-qlanglvl=extended0x" CMAKE_CXX11_COMPILER_FEATURES)
endif()
-set(CMAKE_CXX11_COMPILER_FEATURES)
-
-include("${CMAKE_ROOT}/Modules/Compiler/CxxFeatureTesting.cmake")
-
-record_cxx_compiler_features("-qlanglvl=extended0x" CMAKE_CXX11_COMPILER_FEATURES)
set(CMAKE_CXX_COMPILER_FEATURES
${CMAKE_CXX11_COMPILER_FEATURES}
diff --git a/Modules/Compiler/XL-features.cmake b/Modules/Compiler/XL-features.cmake
index cfbaa3c..64dcb2c 100644
--- a/Modules/Compiler/XL-features.cmake
+++ b/Modules/Compiler/XL-features.cmake
@@ -1,4 +1,2 @@
-set(compiler_test_macro __IBMCPP__)
-
set(feature_test_cxx_delegating_constructors "__IBMCPP__ >= 1110")
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-CXX.cmake | 22 ++++++++++++----------
Modules/Compiler/Clang-features.cmake | 2 --
Modules/Compiler/GNU-CXX.cmake | 22 ++++++++++++----------
Modules/Compiler/GNU-features.cmake | 2 --
Modules/Compiler/Intel-CXX.cmake | 10 ++++------
Modules/Compiler/Intel-features.cmake | 2 --
Modules/Compiler/XL-CXX.cmake | 8 +++-----
Modules/Compiler/XL-features.cmake | 2 --
8 files changed, 31 insertions(+), 39 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list