[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3635-g0ca292b

[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  0ca292b79888283cdb251ad8bec9c3808f1dff3f (commit)
       via  bd92664b7efbe450627a047dd08d4d2a9931c71a (commit)
       via  e0bdf10d84fc92a24930f6a1770ff926c10a95e5 (commit)
      from  5b6bbe56ef4e9278bce012c60a9b47844a1c76bc (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=0ca292b79888283cdb251ad8bec9c3808f1dff3f
commit 0ca292b79888283cdb251ad8bec9c3808f1dff3f
Merge: 5b6bbe5 bd92664
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Aug 2 17:20:54 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 2 17:20:54 2013 -0400

    Merge topic 'cxx11' into next
    
    bd92664 try to pass ModuleNotices test
    e0bdf10 ignore C++11 flag if expected flag is not known


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

    try to pass ModuleNotices test

diff --git a/Modules/FindCXXFeatures.cmake b/Modules/FindCXXFeatures.cmake
index a4acb2c..c5d0c35 100644
--- a/Modules/FindCXXFeatures.cmake
+++ b/Modules/FindCXXFeatures.cmake
@@ -22,7 +22,7 @@
 #  CXXFeatures_variadic_templates_FOUND   - variadic templates
 
 #=============================================================================
-# Copyright 2011,2012,2013 Rolf Eike Beer <eike at sf-mail.de>
+# Copyright 2011-2013 Rolf Eike Beer <eike at sf-mail.de>
 # Copyright 2012 Andreas Weis
 # Copyright 2013 Jan Kundrát
 #

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

    ignore C++11 flag if expected flag is not known

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index dd5be4c..c9f5e4f 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -54,7 +54,7 @@ foreach (flag IN LISTS _all_cxx_features)
     endif ()
 endforeach (flag)
 
-if (NOT CXX11_COMPILER_FLAGS STREQUAL _expected_cxx11_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})

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

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


hooks/post-receive
-- 
CMake