[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3058-g77773e2
Stephen Kelly
steveire at gmail.com
Thu May 8 12:50:01 EDT 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 77773e22567b6ba2694fe83584429f75d5d005e7 (commit)
via 58af1d47b8d5e1c8210fed76a98f586f2f369d59 (commit)
from 657fcf54d92b70269cc9f8d7c7f52a981979ea61 (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=77773e22567b6ba2694fe83584429f75d5d005e7
commit 77773e22567b6ba2694fe83584429f75d5d005e7
Merge: 657fcf5 58af1d4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 8 12:50:01 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 8 12:50:01 2014 -0400
Merge topic 'WriteCompilerDetectionHeader-module' into next
58af1d47 Simplify condition.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58af1d47b8d5e1c8210fed76a98f586f2f369d59
commit 58af1d47b8d5e1c8210fed76a98f586f2f369d59
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 8 18:49:29 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 8 18:49:29 2014 +0200
Simplify condition.
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
index 96bec25..6c5e0be 100644
--- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
+++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt
@@ -18,8 +18,7 @@ write_compiler_detection_header(
${cxx_known_features}
)
-if (NOT CMAKE_CXX_COMPILER_ID STREQUAL GNU
- OR (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7))
+if (NOT CMAKE_CXX_COMPILE_FEATURES)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp"
"int main(int,char**) { return 0; }\n"
)
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list