[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2888-gcba0bed

Stephen Kelly steveire at gmail.com
Tue May 6 17:30:13 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  cba0beda6974c7ee227345ae04c5f135d854dc3f (commit)
       via  cec7cd283ff8a1f4e867dd85b8dc81966f8add5a (commit)
      from  b0ba370ba65818fb061e41edf280f61eec2cae66 (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=cba0beda6974c7ee227345ae04c5f135d854dc3f
commit cba0beda6974c7ee227345ae04c5f135d854dc3f
Merge: b0ba370 cec7cd2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 6 17:30:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 17:30:12 2014 -0400

    Merge topic 'clang-features' into next
    
    cec7cd28 Exclude FreeBSD.


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

    Exclude FreeBSD.
    
    Features are not recorded for it, apparently.

diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 8f2da8b..0b813a6 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -28,7 +28,8 @@ macro(cmake_record_cxx_compile_features)
     record_compiler_features(CXX "-std=${std_version}" ${list})
   endmacro()
 
-  if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+  if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD
+      AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
     _get_clang_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
     if (_result EQUAL 0)
       _get_clang_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list