[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-535-gfd94816
Stephen Kelly
steveire at gmail.com
Tue Nov 11 17:18:03 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 fd94816124c93d886f1c2bf2417d38eecd594ed9 (commit)
via 629ccd2d7badafc8c1cbcb89156f953ab532cda3 (commit)
from 8bb140b9caa41c5ac5a668e7f8f422eef0f36f19 (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=fd94816124c93d886f1c2bf2417d38eecd594ed9
commit fd94816124c93d886f1c2bf2417d38eecd594ed9
Merge: 8bb140b 629ccd2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 17:18:02 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 11 17:18:02 2014 -0500
Merge topic 'compile-features-refactor' into next
629ccd2d fixup! Features: Use the correct dialect flag when recording features.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=629ccd2d7badafc8c1cbcb89156f953ab532cda3
commit 629ccd2d7badafc8c1cbcb89156f953ab532cda3
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 23:16:46 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 11 23:16:46 2014 +0100
fixup! Features: Use the correct dialect flag when recording features.
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index f237285..780a072 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -35,7 +35,7 @@ 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)
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 9aeee59..422bacd 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -36,7 +36,7 @@ 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)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Clang-CXX.cmake | 2 +-
Modules/Compiler/GNU-CXX.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list