[cmake-commits] king committed CMakeLists.txt 1.11 1.12
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Dec 30 16:11:40 EST 2007
Update of /cvsroot/CMake/CMake/Tests/Fortran
In directory public:/mounts/ram/cvs-serv20471/Tests/Fortran
Modified Files:
CMakeLists.txt
Log Message:
ENH: Implemented Fortran module output directory and search path flags.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Fortran/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CMakeLists.txt 29 Dec 2007 03:53:34 -0000 1.11
+++ CMakeLists.txt 30 Dec 2007 21:11:38 -0000 1.12
@@ -23,9 +23,7 @@
in_interface/main.f90
in_interface/module.f90)
- IF(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
- SET(TEST_MODULE_DEPENDS 1)
- ENDIF(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
+ SET(TEST_MODULE_DEPENDS 1)
ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
IF(TEST_MODULE_DEPENDS)
@@ -57,6 +55,13 @@
)
ADD_CUSTOM_TARGET(ExternalTarget ALL DEPENDS ${testf_BINARY_DIR}/ExternalProject)
+ # Test module output directory if available.
+ IF(CMAKE_Fortran_MODDIR_FLAG)
+ SET(Library_MODDIR "${testf_BINARY_DIR}/Library/modules")
+ ELSE(CMAKE_Fortran_MODDIR_FLAG)
+ SET(Library_MODDIR "${testf_BINARY_DIR}/Library")
+ ENDIF(CMAKE_Fortran_MODDIR_FLAG)
+
ADD_SUBDIRECTORY(Library)
ADD_SUBDIRECTORY(Executable)
ENDIF(TEST_MODULE_DEPENDS)
More information about the Cmake-commits
mailing list