[Cmake-commits] CMake branch, next, updated. v2.8.12-4572-g81863d5

[Brad King]

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  81863d5625cb25b4870beaab9f2b012c5476cbe0 (commit)
       via  e65c7887676b419bfcc6b89cb64f7e6c66b174f1 (commit)
      from  f4508546740e98335cd817220707d4f876ee0d66 (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=81863d5625cb25b4870beaab9f2b012c5476cbe0
commit 81863d5625cb25b4870beaab9f2b012c5476cbe0
Merge: f450854 e65c788
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 09:09:13 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 28 09:09:13 2013 -0400

    Merge topic 'external-language-compiler-id' into next
    
    e65c788 CMakeDetermineCompilerId: Load src from CMAKE_MODULE_PATH (#14481)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e65c7887676b419bfcc6b89cb64f7e6c66b174f1
commit e65c7887676b419bfcc6b89cb64f7e6c66b174f1
Author:     Dragos Carp <dragoscarp at gmail.com>
AuthorDate: Thu Oct 24 22:20:31 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 28 08:54:40 2013 -0400

    CMakeDetermineCompilerId: Load src from CMAKE_MODULE_PATH (#14481)
    
    Support new languages using CMAKE_MODULE_PATH.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 762d4ae..4087060 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -85,7 +85,9 @@ endfunction()
 #-----------------------------------------------------------------------------
 # Function to write the compiler id source file.
 function(CMAKE_DETERMINE_COMPILER_ID_WRITE lang src)
-  file(READ ${CMAKE_ROOT}/Modules/${src}.in ID_CONTENT_IN)
+  find_file(src_in ${src}.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH} NO_DEFAULT_PATH)
+  file(READ ${src_in} ID_CONTENT_IN)
+  unset(src_in CACHE)
   string(CONFIGURE "${ID_CONTENT_IN}" ID_CONTENT_OUT @ONLY)
   file(WRITE ${CMAKE_${lang}_COMPILER_ID_DIR}/${src} "${ID_CONTENT_OUT}")
 endfunction()

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

Summary of changes:
 Modules/CMakeDetermineCompilerId.cmake |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake