[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2468-g8eaf61b

[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  8eaf61bd3920963703adcfcace4be01ae7290cdd (commit)
       via  3fec5fee82c200c09a9bca883fa2764a1c938d08 (commit)
      from  3f46c7e526cd9cf2128eb95e4feea2681bcf4b63 (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=8eaf61bd3920963703adcfcace4be01ae7290cdd
commit 8eaf61bd3920963703adcfcace4be01ae7290cdd
Merge: 3f46c7e 3fec5fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 11:12:09 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 18 11:12:09 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    3fec5fee Determine languages from the feature list.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fec5fee82c200c09a9bca883fa2764a1c938d08
commit 3fec5fee82c200c09a9bca883fa2764a1c938d08
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 17:09:27 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 18 17:11:33 2014 +0200

    Determine languages from the feature list.

diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake
index 1043024..a3cb7ba 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -212,7 +212,17 @@ function(write_compiler_detection_header
     file(APPEND "${file_arg}" "\n${_WCD_PROLOG}\n")
   endif()
 
-  foreach(_lang CXX)
+  foreach(feature ${_WCD_FEATURES})
+    if (feature MATCHES "^cxx_")
+      list(APPEND _langs CXX)
+    endif()
+    if (feature MATCHES "^c_")
+      list(APPEND _langs C)
+    endif()
+  endforeach()
+  list(REMOVE_DUPLICATES _langs)
+
+  foreach(_lang ${_langs})
 
     if(_lang STREQUAL CXX)
       file(APPEND "${file_arg}" "\n#ifdef __cplusplus\n")

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

Summary of changes:
 Modules/WriteCompilerDetectionHeader.cmake |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake