[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2884-geb547e2

Stephen Kelly steveire at gmail.com
Tue May 6 17:24:54 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  eb547e2920c37e58efceec4ac5c9569fa7af124e (commit)
       via  2d45f7be721dcbf798ba3826fbfa3d1c1884c7f8 (commit)
      from  c005e48dbbd6d8898726b5a3466d4de84afe18d1 (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=eb547e2920c37e58efceec4ac5c9569fa7af124e
commit eb547e2920c37e58efceec4ac5c9569fa7af124e
Merge: c005e48 2d45f7b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 17:24:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 17:24:53 2014 -0400

    Merge topic 'clang-features' into next
    
    2d45f7be Fix feature test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d45f7be721dcbf798ba3826fbfa3d1c1884c7f8
commit 2d45f7be721dcbf798ba3826fbfa3d1c1884c7f8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 23:24:28 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 6 23:24:28 2014 +0200

    Fix feature test.

diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 8fcea34..8f2da8b 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -26,14 +26,13 @@ endif()
 macro(cmake_record_cxx_compile_features)
   macro(_get_clang_features std_version list)
     record_compiler_features(CXX "-std=${std_version}" ${list})
-    if (NOT _result EQUAL 0)
-      return()
-    endif()
   endmacro()
 
   if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
     _get_clang_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
-    _get_clang_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+    if (_result EQUAL 0)
+      _get_clang_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+    endif()
   else()
     set(_result 0)
   endif()

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/Clang-CXX.cmake |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list