[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2932-gd57a5a5

[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  d57a5a56dd7c6f65aa5682c30e129a73a26104f4 (commit)
       via  cefa066b8598b80869bc5e7f4ecd29ca66ff72c2 (commit)
      from  50727fce094c5ff8b6ce3f256a89cf0689b975f3 (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=d57a5a56dd7c6f65aa5682c30e129a73a26104f4
commit d57a5a56dd7c6f65aa5682c30e129a73a26104f4
Merge: 50727fc cefa066
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 06:47:15 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 06:47:15 2014 -0400

    Merge topic 'compiler-id-refactor' into next
    
    cefa066b Generalize language-specific variables.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cefa066b8598b80869bc5e7f4ecd29ca66ff72c2
commit cefa066b8598b80869bc5e7f4ecd29ca66ff72c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 12:23:57 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:46:45 2014 +0200

    Generalize language-specific variables.

diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake
index bcd6d7f..8cbfc4e 100644
--- a/Modules/CMakeCompilerIdDetection.cmake
+++ b/Modules/CMakeCompilerIdDetection.cmake
@@ -69,13 +69,13 @@ function(compiler_id_detection outvar lang)
 
     if(CID_ID_DEFINE)
       foreach(Id ${ordered_compilers})
-        set(CMAKE_CXX_COMPILER_ID_CONTENT "${CMAKE_CXX_COMPILER_ID_CONTENT}# define ${CID_PREFIX}COMPILER_IS_${Id} 0\n")
+        set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}# define ${CID_PREFIX}COMPILER_IS_${Id} 0\n")
       endforeach()
     endif()
 
     set(pp_if "#if")
     if (CID_VERSION_STRINGS)
-      set(CMAKE_CXX_COMPILER_ID_CONTENT "${CMAKE_CXX_COMPILER_ID_CONTENT}\n/* Version number components: V=Version, R=Revision, P=Patch
+      set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n/* Version number components: V=Version, R=Revision, P=Patch
    Version date components:   YYYY=Year, MM=Month,   DD=Day  */\n")
     endif()
 
@@ -96,7 +96,7 @@ function(compiler_id_detection outvar lang)
         string(CONFIGURE "${_compiler_id_version_compute_${Id}}" VERSION_BLOCK @ONLY)
         set(id_content "${id_content}${VERSION_BLOCK}\n")
       endif()
-      set(CMAKE_CXX_COMPILER_ID_CONTENT "${CMAKE_CXX_COMPILER_ID_CONTENT}\n${id_content}")
+      set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n${id_content}")
       set(pp_if "#elif")
     endforeach()
 
@@ -115,8 +115,8 @@ function(compiler_id_detection outvar lang)
 # define ${CID_PREFIX}COMPILER_ID \"\"")
     endif()
 
-    set(CMAKE_CXX_COMPILER_ID_CONTENT "${CMAKE_CXX_COMPILER_ID_CONTENT}\n${platform_compiler_detection}\n#endif")
+    set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n${platform_compiler_detection}\n#endif")
   endif()
 
-  set(${outvar} ${CMAKE_CXX_COMPILER_ID_CONTENT} PARENT_SCOPE)
+  set(${outvar} ${CMAKE_${lang}_COMPILER_ID_CONTENT} PARENT_SCOPE)
 endfunction()
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index cc246e1..025d296 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -105,7 +105,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_WRITE lang src)
   find_file(src_in ${src}.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
   file(READ ${src_in} ID_CONTENT_IN)
 
-  compiler_id_detection(CMAKE_CXX_COMPILER_ID_CONTENT ${lang}
+  compiler_id_detection(CMAKE_${lang}_COMPILER_ID_CONTENT ${lang}
     ID_STRING
     VERSION_STRINGS
     PLATFORM_DEFAULT_COMPILER

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

Summary of changes:
 Modules/CMakeCompilerIdDetection.cmake |   10 +++++-----
 Modules/CMakeDetermineCompilerId.cmake |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake