[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.32 1.33
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Oct 5 16:51:13 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/Fortran
In directory public:/mounts/ram/cvs-serv8177/Tests/Fortran
Modified Files:
CMakeLists.txt
Log Message:
Fortran test: Match config for external project
In the Fortran test we use a custom command to build another Fortran
project internally. The project provides a Fortran module and library
to which to link. This commit teaches the test to build the extra
project using the same build configuration as the main project.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Fortran/CMakeLists.txt,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** CMakeLists.txt 9 Sep 2009 20:39:53 -0000 1.32
--- CMakeLists.txt 5 Oct 2009 20:51:11 -0000 1.33
***************
*** 150,155 ****
--- 150,157 ----
if(CMAKE_CONFIGURATION_TYPES)
set(External_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
+ set(External_BUILD_TYPE)
else(CMAKE_CONFIGURATION_TYPES)
set(External_CONFIG_TYPE)
+ set(External_BUILD_TYPE -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
endif(CMAKE_CONFIGURATION_TYPES)
add_custom_command(
***************
*** 171,174 ****
--- 173,177 ----
-DCMAKE_Fortran_FLAGS_MINSIZEREL:STRING=${CMAKE_Fortran_FLAGS_MINSIZEREL}
-DCMAKE_Fortran_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_Fortran_FLAGS_RELWITHDEBINFO}
+ ${External_BUILD_TYPE}
)
add_custom_target(ExternalTarget ALL DEPENDS ${testf_BINARY_DIR}/ExternalProject)
More information about the Cmake-commits
mailing list