[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2928-g65cfe28

[Stephen Kelly]

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  65cfe28ab5979c562d71fb9dce3bcea467d80ab9 (commit)
       via  0b5bed072704fdb53a6ba6e774a9588917f9258d (commit)
      from  a106f5a2bcece7f39b17b5d0bbe44ae6168885e3 (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=65cfe28ab5979c562d71fb9dce3bcea467d80ab9
commit 65cfe28ab5979c562d71fb9dce3bcea467d80ab9
Merge: a106f5a 0b5bed0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 06:45:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 06:45:33 2014 -0400

    Merge topic 'GNU-4.7-features' into next
    
    0b5bed07 Add language to test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b5bed072704fdb53a6ba6e774a9588917f9258d
commit 0b5bed072704fdb53a6ba6e774a9588917f9258d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 12:43:01 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:43:17 2014 +0200

    Add language to test

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index fbe6687..1793d8f 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -11,25 +11,25 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES)
   return()
 endif()
 
-macro(run_test feature)
+macro(run_cxx_test feature)
   if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ${feature})
     add_library(test_${feature} OBJECT ${feature}.cpp)
     set_property(TARGET test_${feature}
       PROPERTY COMPILE_FEATURES "${feature}"
     )
   else()
-    list(APPEND non_features ${feature})
+    list(APPEND cxx_non_features ${feature})
   endif()
 endmacro()
 
-get_property(features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
-foreach(feature ${features})
-  run_test(${feature})
+get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+foreach(feature ${cxx_features})
+  run_cxx_test(${feature})
 endforeach()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
   include(CheckCXXSourceCompiles)
-  foreach(feature ${non_features})
+  foreach(feature ${cxx_non_features})
     check_cxx_source_compiles("#include \"${CMAKE_CURRENT_SOURCE_DIR}/${feature}.cpp\"\nint main() { return 0; }\n" ${feature}_works)
     if (${feature}_works)
       message(SEND_ERROR

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

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


hooks/post-receive
-- 
CMake