[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3649-ge9382a2

[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  e9382a2c75f1281ee9c80f7388a4f098dceb5ace (commit)
       via  a9aab3c27f52066336883ae7b9d281b7f515e4b4 (commit)
      from  888359b8434cc55fa0f09ac6327eb281c6e30191 (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=e9382a2c75f1281ee9c80f7388a4f098dceb5ace
commit e9382a2c75f1281ee9c80f7388a4f098dceb5ace
Merge: 888359b a9aab3c
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 08:07:20 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 4 08:07:20 2013 -0400

    Merge topic 'cxx11' into next
    
    a9aab3c CXXFeatures: constexpr since g++ 4.6, fix setting CMAKE_CXX_FLAGS


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9aab3c27f52066336883ae7b9d281b7f515e4b4
commit a9aab3c27f52066336883ae7b9d281b7f515e4b4
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 14:06:59 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Aug 4 14:06:59 2013 +0200

    CXXFeatures: constexpr since g++ 4.6, fix setting CMAKE_CXX_FLAGS

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index cba1358..74e939a 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -42,6 +42,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
         endif ()
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
             list(APPEND _expected_features
+                 CXXFeatures_constexpr_FOUND
                  CXXFeatures_nullptr_FOUND)
         endif ()
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5)
@@ -51,7 +52,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
             list(APPEND _expected_features
                  CXXFeatures_auto_FOUND
-                 CXXFeatures_constexpr_FOUND
                  CXXFeatures_cstdint_header_FOUND
                  CXXFeatures_defaulted_functions_FOUND
                  CXXFeatures_deleted_functions_FOUND
@@ -127,7 +127,7 @@ endforeach (flag)
 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})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
 add_executable(CXXFeatures cxxfeatures.cxx)
 
 enable_testing()

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

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


hooks/post-receive
-- 
CMake