[Cmake-commits] CMake branch, next, updated. v3.1.0-1415-g8cdd0d4

[Robert Maynard]

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  8cdd0d4208bb8782049cdc750bd516f96d5b5cba (commit)
       via  ea913ff805b7d54cabc27f4a1d05515cf996c0fc (commit)
      from  cad7445c492ece031d0521f4dc04ea05bf4770a7 (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=8cdd0d4208bb8782049cdc750bd516f96d5b5cba
commit 8cdd0d4208bb8782049cdc750bd516f96d5b5cba
Merge: cad7445 ea913ff
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 14:02:02 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 30 14:02:02 2014 -0500

    Merge topic 'feature_record_msvc' into next
    
    ea913ff8 fixup syntax issue.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea913ff805b7d54cabc27f4a1d05515cf996c0fc
commit ea913ff805b7d54cabc27f4a1d05515cf996c0fc
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Dec 30 14:00:14 2014 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Dec 30 14:00:14 2014 -0500

    fixup syntax issue.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 52524f9..072dfce 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
 
 project(CompileFeatures)
 
@@ -31,13 +31,13 @@ foreach(feature ${cxx_features})
   run_test(${feature} CXX)
 endforeach()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
   list(REMOVE_ITEM CXX_non_features
     cxx_alignof
   )
 endif()
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
   # GNU prior to 4.9 does not set any preprocessor define to distinguish
   # c++1y from c++11, so CMake does not support c++1y features before GNU 4.9.
@@ -57,6 +57,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     #older compiler pass the test but might not actually conform
     cxx_contextual_conversions
     )
+endif()
 
 set(C_ext c)
 set(C_standard_flag 11)

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

Summary of changes:
 Tests/CompileFeatures/CMakeLists.txt |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake