[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2464-gb366302

[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  b366302f11ff6e2ba354110dff8b728d8f486548 (commit)
       via  dc69e0acc940074e0016c94a1611afa1c15fc643 (commit)
       via  3f93d8446cc1cd3e6e192fa2567a844819fe34d1 (commit)
      from  964ad277011a4c327999f6de0661bdf77274cb42 (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=b366302f11ff6e2ba354110dff8b728d8f486548
commit b366302f11ff6e2ba354110dff8b728d8f486548
Merge: 964ad27 dc69e0a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 10:55:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 18 10:55:44 2014 -0400

    Merge topic 'WriteCompilerDetectionHeader-module' into next
    
    dc69e0ac Ensure that the PREFIX is empty when configuring.
    3f93d844 Avoid preprocessor include.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc69e0acc940074e0016c94a1611afa1c15fc643
commit dc69e0acc940074e0016c94a1611afa1c15fc643
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 16:54:04 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 18 16:54:47 2014 +0200

    Ensure that the PREFIX is empty when configuring.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 464665b..b932d6f 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -105,8 +105,11 @@ function(CMAKE_DETERMINE_COMPILER_ID_WRITE lang src)
   get_filename_component(hdr_in ${src_in} NAME_WE)
   get_filename_component(hdr_path ${src_in} PATH)
   if (EXISTS ${hdr_path}/${hdr_in}.h.in)
+    set(_CDCIW_PREFIX_OLD ${PREFIX})
+    unset(PREFIX)
     file(READ ${hdr_path}/${hdr_in}.h.in CMAKE_CXX_COMPILER_ID_HEADER_CONTENT)
     string(CONFIGURE ${CMAKE_CXX_COMPILER_ID_HEADER_CONTENT} CMAKE_CXX_COMPILER_ID_HEADER_CONTENT @ONLY)
+    set(PREFIX ${_CDCIW_PREFIX_OLD})
   endif()
   unset(src_in CACHE)
   string(CONFIGURE "${ID_CONTENT_IN}" ID_CONTENT_OUT @ONLY)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f93d8446cc1cd3e6e192fa2567a844819fe34d1
commit 3f93d8446cc1cd3e6e192fa2567a844819fe34d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Apr 18 16:51:12 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Apr 18 16:51:12 2014 +0200

    Avoid preprocessor include.
    
    Generate header into template instead.

diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index e65f397..d9b6693 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -5,7 +5,7 @@
 # error "A C compiler has been selected for C++."
 #endif
 
-#include "CMakeCXXCompilerId.h"
+ at CMAKE_CXX_COMPILER_ID_HEADER_CONTENT@
 
 /* Construct the string literal in pieces to prevent the source from
    getting matched.  Store it in a pointer rather than an array
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 8051af2..464665b 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -105,7 +105,8 @@ function(CMAKE_DETERMINE_COMPILER_ID_WRITE lang src)
   get_filename_component(hdr_in ${src_in} NAME_WE)
   get_filename_component(hdr_path ${src_in} PATH)
   if (EXISTS ${hdr_path}/${hdr_in}.h.in)
-    configure_file(${hdr_path}/${hdr_in}.h.in ${CMAKE_${lang}_COMPILER_ID_DIR}/${hdr_in}.h)
+    file(READ ${hdr_path}/${hdr_in}.h.in CMAKE_CXX_COMPILER_ID_HEADER_CONTENT)
+    string(CONFIGURE ${CMAKE_CXX_COMPILER_ID_HEADER_CONTENT} CMAKE_CXX_COMPILER_ID_HEADER_CONTENT @ONLY)
   endif()
   unset(src_in CACHE)
   string(CONFIGURE "${ID_CONTENT_IN}" ID_CONTENT_OUT @ONLY)

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

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


hooks/post-receive
-- 
CMake