[Cmake-commits] CMake branch, next, updated. v2.8.6-2174-gde2bbba

[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  de2bbba316ad3b207d906a670ce8ce8d4e0b9c14 (commit)
       via  4cb73c43ac13a4b796c61da137a1576c8c6a4d23 (commit)
      from  61e773ab20e417b5a1a7e30ac1c9143efa5269c4 (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=de2bbba316ad3b207d906a670ce8ce8d4e0b9c14
commit de2bbba316ad3b207d906a670ce8ce8d4e0b9c14
Merge: 61e773a 4cb73c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 9 09:59:35 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 9 09:59:35 2011 -0500

    Merge topic 'FortranCInterface-MinGW' into next
    
    4cb73c4 FortranCInterface: Work around mingw32-make trouble with parens


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cb73c43ac13a4b796c61da137a1576c8c6a4d23
commit 4cb73c43ac13a4b796c61da137a1576c8c6a4d23
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 9 09:37:46 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 9 09:40:14 2011 -0500

    FortranCInterface: Work around mingw32-make trouble with parens
    
    The mingw32-make tool does not handle parenthesis in the path to a
    source file consistently.  When CMake is installed in a typical location
    like "c:\Program Files (x86)\CMake 2.8\" the mingw32-make tool fails on
    the FortranCInterface detection project sometimes with errors like
    
     >mingw32-make -f CMakeFiles\myfort.dir\build.make CMakeFiles/myfort.dir/my_module.f90.obj
     mingw32-make: *** No rule to make target `x86)/CMake 2.8/share/cmake-2.8/Modules/FortranCInterface/my_module.f90)',
     needed by `CMakeFiles/myfort.dir/my_module.f90.obj'.  Stop.
    
    due to parens in the path to the FortranCInterface source directory.
    However, the behavior varies with the file name of build.make:
    
     >copy CMakeFiles\myfort.dir\build.make CMakeFiles\myfort.dir\build2.make
     >mingw32-make -f CMakeFiles\myfort.dir\build2.make CMakeFiles/myfort.dir/my_module.f90.obj
     [  3%] Building Fortran object CMakeFiles/myfort.dir/my_module.f90.obj
    
    Tested with
    
     >mingw32-make -v
     GNU Make 3.82
     Built for i386-pc-mingw32
    
    Work around the problem by copying the whole FortranCInterface source
    directory in to the project build tree.

diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake
index 90ef59b..2455c5f 100644
--- a/Modules/FortranCInterface.cmake
+++ b/Modules/FortranCInterface.cmake
@@ -116,6 +116,14 @@ endforeach()
 #-----------------------------------------------------------------------------
 set(FortranCInterface_SOURCE_DIR ${CMAKE_ROOT}/Modules/FortranCInterface)
 
+# MinGW's make tool does not always like () in the path
+if("${CMAKE_GENERATOR}" MATCHES "MinGW" AND
+    "${FortranCInterface_SOURCE_DIR}" MATCHES "[()]")
+  file(COPY ${FortranCInterface_SOURCE_DIR}/
+    DESTINATION ${CMAKE_BINARY_DIR}/CMakeFiles/FortranCInterfaceMinGW)
+  set(FortranCInterface_SOURCE_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/FortranCInterfaceMinGW)
+endif()
+
 # Create the interface detection project if it does not exist.
 if(NOT FortranCInterface_BINARY_DIR)
   set(FortranCInterface_BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/FortranCInterface)

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

Summary of changes:
 Modules/FortranCInterface.cmake |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake