[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.36 1.37

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Fortran
In directory public:/mounts/ram/cvs-serv8424/Tests/Fortran

Modified Files:
	CMakeLists.txt 
Log Message:
Fix escapes in Fortran depend.make entries

Makefile dependencies must be escaped using cmLocalGenerator::Convert
with the cmLocalGenerator::MAKEFILE option.  This fixes Fortran module
dependencies with spaces in the path.  We test the fix by adding a space
to one of the module paths in the Fortran test.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Fortran/CMakeLists.txt,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** CMakeLists.txt	26 Oct 2009 15:32:19 -0000	1.36
--- CMakeLists.txt	4 Jan 2010 15:18:41 -0000	1.37
***************
*** 172,175 ****
--- 172,182 ----
      set(External_BUILD_TYPE -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
    endif(CMAKE_CONFIGURATION_TYPES)
+   set(External_SOURCE_DIR "${testf_SOURCE_DIR}/External")
+   set(External_BINARY_DIR "${testf_BINARY_DIR}/External")
+   if("${testf_BINARY_DIR}" MATCHES " ")
+     # Our build tree has a space, so the build tool supports spaces.
+     # Test using modules from a path with spaces.
+     set(External_BINARY_DIR "${External_BINARY_DIR} Build")
+   endif()
    add_custom_command(
      OUTPUT ${testf_BINARY_DIR}/ExternalProject
***************
*** 177,182 ****
      ARGS ${External_CONFIG_TYPE}
           --build-and-test
!          ${testf_SOURCE_DIR}/External
!          ${testf_BINARY_DIR}/External
           --build-noclean
           --build-two-config
--- 184,189 ----
      ARGS ${External_CONFIG_TYPE}
           --build-and-test
!          ${External_SOURCE_DIR}
!          ${External_BINARY_DIR}
           --build-noclean
           --build-two-config