[Cmake-commits] CMake branch, next, updated. v2.8.6-2307-g9a47eba

[Bill Hoffman]

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  9a47eba294aeb006f0d30b8ac2c5fbf739559cf7 (commit)
       via  b4a770d05f4ab116c3c8e5c285f31f0641ce3646 (commit)
      from  92488b316e88fad18ec2605dd7efbe8b1f901ba2 (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=9a47eba294aeb006f0d30b8ac2c5fbf739559cf7
commit 9a47eba294aeb006f0d30b8ac2c5fbf739559cf7
Merge: 92488b3 b4a770d
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Dec 20 17:24:14 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 20 17:24:14 2011 -0500

    Merge topic 'cmake_add_fortran_subdirectory' into next
    
    b4a770d Move config files into a directory.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4a770d05f4ab116c3c8e5c285f31f0641ce3646
commit b4a770d05f4ab116c3c8e5c285f31f0641ce3646
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Dec 20 17:22:37 2011 -0500
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Dec 20 17:22:37 2011 -0500

    Move config files into a directory.
    
    Clean up the location of the CMakeAddFortranSubdirectory helper files.

diff --git a/Modules/build_mingw.cmake.in b/Modules/AddFortranSubdirectory/build_mingw.cmake.in
similarity index 100%
rename from Modules/build_mingw.cmake.in
rename to Modules/AddFortranSubdirectory/build_mingw.cmake.in
diff --git a/Modules/config_mingw.cmake.in b/Modules/AddFortranSubdirectory/config_mingw.cmake.in
similarity index 100%
rename from Modules/config_mingw.cmake.in
rename to Modules/AddFortranSubdirectory/config_mingw.cmake.in
diff --git a/Modules/CMakeAddFortranSubdirectory.cmake b/Modules/CMakeAddFortranSubdirectory.cmake
index ac40efd..c9604fa 100644
--- a/Modules/CMakeAddFortranSubdirectory.cmake
+++ b/Modules/CMakeAddFortranSubdirectory.cmake
@@ -82,10 +82,14 @@ function(_setup_mingw_config_and_build source_dir)
   get_filename_component(MINGW_PATH ${MINGW_GFORTRAN} PATH)
   file(TO_NATIVE_PATH "${MINGW_PATH}" MINGW_PATH)
   string(REPLACE "\\" "\\\\" MINGW_PATH "${MINGW_PATH}")
-  configure_file(${_MS_MINGW_SOURCE_DIR}/config_mingw.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/config_mingw.cmake @ONLY)
-  configure_file(${_MS_MINGW_SOURCE_DIR}/build_mingw.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/build_mingw.cmake @ONLY)
+  configure_file(
+    ${_MS_MINGW_SOURCE_DIR}/AddFortranSubdirectory/config_mingw.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/config_mingw.cmake
+    @ONLY)
+  configure_file(
+    ${_MS_MINGW_SOURCE_DIR}/AddFortranSubdirectory/build_mingw.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/build_mingw.cmake
+    @ONLY)
 endfunction()
 
 function(_add_fortran_library_link_interface library depend_library)

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

Summary of changes:
 .../build_mingw.cmake.in                           |    0
 .../config_mingw.cmake.in                          |    0
 Modules/CMakeAddFortranSubdirectory.cmake          |   12 ++++++++----
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename Modules/{ => AddFortranSubdirectory}/build_mingw.cmake.in (100%)
 rename Modules/{ => AddFortranSubdirectory}/config_mingw.cmake.in (100%)


hooks/post-receive
-- 
CMake