[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3018-g8e910b8

[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  8e910b81d53ff0529edfe24e624cb0732cc6c323 (commit)
       via  87897fc8240c78061df4fda93d4640a26be8123e (commit)
      from  528978c5fa65197771cb37d27df0bcd1ca3782fc (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=8e910b81d53ff0529edfe24e624cb0732cc6c323
commit 8e910b81d53ff0529edfe24e624cb0732cc6c323
Merge: 528978c 87897fc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 16:01:49 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 16:01:49 2014 -0400

    Merge topic 'GNU-4.7-features' into next
    
    87897fc8 Modify run_test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87897fc8240c78061df4fda93d4640a26be8123e
commit 87897fc8240c78061df4fda93d4640a26be8123e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 21:59:26 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 22:00:44 2014 +0200

    Modify run_test.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 1793d8f..61160c5 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_cxx_test feature)
-  if (";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ${feature})
-    add_library(test_${feature} OBJECT ${feature}.cpp)
+macro(run_test feature lang)
+  if (";${CMAKE_${lang}_COMPILE_FEATURES};" MATCHES ${feature})
+    add_library(test_${feature} OBJECT ${feature})
     set_property(TARGET test_${feature}
       PROPERTY COMPILE_FEATURES "${feature}"
     )
   else()
-    list(APPEND cxx_non_features ${feature})
+    list(APPEND ${lang}_non_features ${feature})
   endif()
 endmacro()
 
 get_property(cxx_features GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
 foreach(feature ${cxx_features})
-  run_cxx_test(${feature})
+  run_test(${feature} CXX)
 endforeach()
 
 if (CMAKE_CXX_COMPILE_FEATURES)
   include(CheckCXXSourceCompiles)
-  foreach(feature ${cxx_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