[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3639-ged99079

[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  ed99079835905ab44e701ae4f36dea9428db2343 (commit)
       via  7b140e6059b82e753dcf6c073d2aa7a9e2072bc2 (commit)
      from  be7378866fecaf06ab0c752cf908210f682bfc1a (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=ed99079835905ab44e701ae4f36dea9428db2343
commit ed99079835905ab44e701ae4f36dea9428db2343
Merge: be73788 7b140e6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 3 00:39:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 3 00:39:47 2013 -0400

    Merge topic 'cxx11' into next
    
    7b140e6 CXXFeatures: fix elseif()


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b140e6059b82e753dcf6c073d2aa7a9e2072bc2
commit 7b140e6059b82e753dcf6c073d2aa7a9e2072bc2
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 3 06:39:10 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Aug 3 06:39:10 2013 +0200

    CXXFeatures: fix elseif()

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 632d797..5091838 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -30,7 +30,7 @@ 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)
+    elseif (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")

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

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


hooks/post-receive
-- 
CMake