[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3637-gbe73788

[Rolf Eike Beer]

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  be7378866fecaf06ab0c752cf908210f682bfc1a (commit)
       via  9a608e748adf7b4a6d187d406da4b1fbf687e22d (commit)
      from  0ca292b79888283cdb251ad8bec9c3808f1dff3f (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=be7378866fecaf06ab0c752cf908210f682bfc1a
commit be7378866fecaf06ab0c752cf908210f682bfc1a
Merge: 0ca292b 9a608e7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 2 17:53:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 2 17:53:26 2013 -0400

    Merge topic 'cxx11' into next
    
    9a608e7 CXXFeatures: update expected features


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a608e748adf7b4a6d187d406da4b1fbf687e22d
commit 9a608e748adf7b4a6d187d406da4b1fbf687e22d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 2 23:53:17 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Aug 2 23:53:17 2013 +0200

    CXXFeatures: update expected features

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index c9f5e4f..632d797 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -30,9 +30,30 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
         set(_expected_features ${_all_cxx_features})
         set(_expected_cxx11_flag "-std=c++11")
+    else (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
+        set(_expected_features CXXFeatures_long_long_FOUND
+                               CXXFeatures_func_identifier_FOUND)
+        set(_expected_cxx11_flag "-std=c++0x")
     else ()
+        # no idea since when this is supported, but it is at least
+        # supported since 3.1
+        set(_expected_features CXXFeatures_long_long_FOUND
+                               CXXFeatures_func_identifier_FOUND)
+        set(_expected_cxx11_flag "")
+    endif ()
+elseif (MSVC)
+    set(_expected_cxx11_flag "")
+    if (NOT MSVC_VERSION VERSION_LESS 1600)
+        set(_expected_features CXXFeatures_auto_FOUND
+                               CXXFeatures_cstdint_header_FOUND
+                               CXXFeatures_decltype_FOUND
+                               CXXFeatures_lambda_FOUND
+                               CXXFeatures_long_long_FOUND
+                               CXXFeatures_nullptr_FOUND
+                               CXXFeatures_rvalue_references_FOUND
+                               CXXFeatures_static_assert_FOUND)
+    else (NOT MSVC_VERSION VERSION_LESS 1301)
         set(_expected_features CXXFeatures_long_long_FOUND)
-        set(_expected_cxx11_flag "-std=c++0x")
     endif ()
 else ()
     message(WARNING "Your C++ compiler configuration is not in the list of known configurations")
@@ -54,7 +75,8 @@ foreach (flag IN LISTS _all_cxx_features)
     endif ()
 endforeach (flag)
 
-if (NOT CXX11_COMPILER_FLAGS STREQUAL _expected_cxx11_flag AND NOT _compiler_unknown_features)
+# variables must be expanded here so it still works if both are empty
+if (NOT "${CXX11_COMPILER_FLAGS}" STREQUAL "${_expected_cxx11_flag}" AND NOT _compiler_unknown_features)
     message(SEND_ERROR "Found C++11 flag '${CXX11_COMPILER_FLAGS}' but expected '${_expected_cxx11_flag}'")
 endif ()
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS})

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

Summary of changes:
 Tests/Module/CXXFeatures/CMakeLists.txt |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake