[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.32.2.2 1.32.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
CMake 2.8.1-rc1


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Fortran/CMakeLists.txt,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -C 2 -d -r1.32.2.2 -r1.32.2.3
*** CMakeLists.txt	28 Oct 2009 16:17:12 -0000	1.32.2.2
--- CMakeLists.txt	28 Jan 2010 21:48:14 -0000	1.32.2.3
***************
*** 35,39 ****
    FortranCInterface_VERIFY(CXX)
    if(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
!     if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "SunPro|MIPSpro")
        set(module_expected 1)
      endif()
--- 35,39 ----
    FortranCInterface_VERIFY(CXX)
    if(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
!     if(NOT CMAKE_Fortran_COMPILER_ID MATCHES "SunPro|MIPSpro|PathScale")
        set(module_expected 1)
      endif()
***************
*** 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