[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-591-g8ecefbf
Stephen Kelly
steveire at gmail.com
Wed Nov 12 16:58:25 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 8ecefbf3fbd76224f40c3696046280a2df29d7a3 (commit)
via 58dcfe0f4860bdc5d2df42912ac03d5ec24d858d (commit)
via d94e19a4c2a80894b7be42005b8d5b5df5209701 (commit)
via a68cdd9fed5697d742b213fc150c447c70c9f9f9 (commit)
from 96d7e9b761d6d96b7863f8303cff1ae7e59dc132 (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=8ecefbf3fbd76224f40c3696046280a2df29d7a3
commit 8ecefbf3fbd76224f40c3696046280a2df29d7a3
Merge: 96d7e9b 58dcfe0
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 16:58:24 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 16:58:24 2014 -0500
Merge topic 'compile-features-refactor' into next
58dcfe0f Features: Run GNU feature tests with std=c++14 when available.
d94e19a4 Features: Use the correct dialect flag when recording features.
a68cdd9f Features: Reorder the order of GNU dialect feature tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58dcfe0f4860bdc5d2df42912ac03d5ec24d858d
commit 58dcfe0f4860bdc5d2df42912ac03d5ec24d858d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 23:11:17 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:57:21 2014 +0100
Features: Run GNU feature tests with std=c++14 when available.
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 1050679..422bacd 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -24,7 +24,10 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
endif()
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+ set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d94e19a4c2a80894b7be42005b8d5b5df5209701
commit d94e19a4c2a80894b7be42005b8d5b5df5209701
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 23:06:03 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:57:21 2014 +0100
Features: Use the correct dialect flag when recording features.
Avoid using -std=c++1y for compilers which support -std=c++14, for
example.
diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake
index 05d3c0b..92119ba 100644
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@ -21,16 +21,16 @@ set(CMAKE_C_STANDARD_DEFAULT 90)
macro(cmake_record_c_compile_features)
macro(_get_clang_features std_version list)
- record_compiler_features(C "-std=${std_version}" ${list})
+ record_compiler_features(C "${std_version}" ${list})
endmacro()
if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
- _get_clang_features(c11 CMAKE_C11_COMPILE_FEATURES)
+ _get_clang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
if (_result EQUAL 0)
- _get_clang_features(c99 CMAKE_C99_COMPILE_FEATURES)
+ _get_clang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
endif()
if (_result EQUAL 0)
- _get_clang_features(c90 CMAKE_C90_COMPILE_FEATURES)
+ _get_clang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
endif()
else()
set(_result 0)
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 5dd7b4a..780a072 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -35,16 +35,16 @@ set(CMAKE_CXX_STANDARD_DEFAULT 98)
macro(cmake_record_cxx_compile_features)
macro(_get_clang_features std_version list)
- record_compiler_features(CXX "-std=${std_version}" ${list})
+ record_compiler_features(CXX "${std_version}" ${list})
endmacro()
if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
- _get_clang_features(c++1y CMAKE_CXX14_COMPILE_FEATURES)
+ _get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
if (_result EQUAL 0)
- _get_clang_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
+ _get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
endif()
if (_result EQUAL 0)
- _get_clang_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+ _get_clang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
endif()
else()
set(_result 0)
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index d678b68..c4a2ed6 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -17,16 +17,16 @@ set(CMAKE_C_STANDARD_DEFAULT 90)
macro(cmake_record_c_compile_features)
macro(_get_gcc_features std_version list)
- record_compiler_features(C "-std=${std_version}" ${list})
+ record_compiler_features(C "${std_version}" ${list})
endmacro()
if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
- _get_gcc_features(c11 CMAKE_C11_COMPILE_FEATURES)
+ _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
if (_result EQUAL 0)
- _get_gcc_features(c99 CMAKE_C99_COMPILE_FEATURES)
+ _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
endif()
if (_result EQUAL 0)
- _get_gcc_features(c90 CMAKE_C90_COMPILE_FEATURES)
+ _get_gcc_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
endif()
else()
set(_result 0)
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 14dc76a..1050679 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -33,19 +33,19 @@ set(CMAKE_CXX_STANDARD_DEFAULT 98)
macro(cmake_record_cxx_compile_features)
macro(_get_gcc_features std_version list)
- record_compiler_features(CXX "-std=${std_version}" ${list})
+ record_compiler_features(CXX "${std_version}" ${list})
endmacro()
set(_result 0)
if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
- _get_gcc_features(c++1y CMAKE_CXX14_COMPILE_FEATURES)
+ _get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
endif()
if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
if (_result EQUAL 0)
- _get_gcc_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
+ _get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
endif()
if (_result EQUAL 0)
- _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+ _get_gcc_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
endif()
else()
set(_result 0)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a68cdd9fed5697d742b213fc150c447c70c9f9f9
commit a68cdd9fed5697d742b213fc150c447c70c9f9f9
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 22:53:31 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:56:16 2014 +0100
Features: Reorder the order of GNU dialect feature tests
This doesn't make a difference, but the consistency with other files
is easier to reason about.
diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake
index 35954be..d678b68 100644
--- a/Modules/Compiler/GNU-C.cmake
+++ b/Modules/Compiler/GNU-C.cmake
@@ -21,12 +21,12 @@ macro(cmake_record_c_compile_features)
endmacro()
if (UNIX AND NOT APPLE AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7)
- _get_gcc_features(c90 CMAKE_C90_COMPILE_FEATURES)
+ _get_gcc_features(c11 CMAKE_C11_COMPILE_FEATURES)
if (_result EQUAL 0)
_get_gcc_features(c99 CMAKE_C99_COMPILE_FEATURES)
endif()
if (_result EQUAL 0)
- _get_gcc_features(c11 CMAKE_C11_COMPILE_FEATURES)
+ _get_gcc_features(c90 CMAKE_C90_COMPILE_FEATURES)
endif()
else()
set(_result 0)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list