[cmake-commits] king committed CMakeLists.txt 1.9 1.10

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Add tests of Fortran module dependencies across directories and on external modules.  Tests based on cases provided by Maik in issue #5809.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Fortran/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CMakeLists.txt	15 Dec 2007 20:36:13 -0000	1.9
+++ CMakeLists.txt	28 Dec 2007 16:50:29 -0000	1.10
@@ -22,5 +22,34 @@
     in_interface/main.f90
     in_interface/module.f90)
 
+  # Build the external project separately using a custom target.
+  # Make sure it uses the same build configuration as this test.
+  IF(CMAKE_CONFIGURATION_TYPES)
+    SET(External_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
+  ELSE(CMAKE_CONFIGURATION_TYPES)
+    SET(External_CONFIG_TYPE)
+  ENDIF(CMAKE_CONFIGURATION_TYPES)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${testf_BINARY_DIR}/ExternalProject
+    COMMAND ${CMAKE_CTEST_COMMAND}
+    ARGS ${External_CONFIG_TYPE}
+         --build-and-test
+         ${testf_SOURCE_DIR}/External
+         ${testf_BINARY_DIR}/External
+         --build-noclean
+         --build-two-config
+         --build-project ExtFort
+         --build-generator ${CMAKE_GENERATOR}
+         --build-makeprogram ${CMAKE_MAKE_PROGRAM}
+         --build-options -DCMAKE_Fortran_COMPILER:STRING=${CMAKE_Fortran_COMPILER}
+                         -DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}
+                         -DCMAKE_Fortran_FLAGS_DEBUG:STRING=${CMAKE_Fortran_FLAGS_DEBUG}
+                         -DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}
+                         -DCMAKE_Fortran_FLAGS_MINSIZEREL:STRING=${CMAKE_Fortran_FLAGS_MINSIZEREL}
+                         -DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_Fortran_FLAGS_RELWITHDEBINFO}
+         )
+  ADD_CUSTOM_TARGET(ExternalTarget ALL DEPENDS ${testf_BINARY_DIR}/ExternalProject)
+
   ADD_SUBDIRECTORY(Library)
+  ADD_SUBDIRECTORY(Executable)
 ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)