diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-18 00:58:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-18 00:58:01 (GMT) |
| commit | 8d1d5500c8cb7ebabce73777c79c33074e679ab5 (patch) | |
| tree | 27c37321fe8aff93398c9309462eb4f05b735778 /Modules | |
| parent | 7f589c9f23ee64ca0d36e81a02a70a87bc7fbbbe (diff) | |
| download | CMake-8d1d5500c8cb7ebabce73777c79c33074e679ab5.zip CMake-8d1d5500c8cb7ebabce73777c79c33074e679ab5.tar.gz CMake-8d1d5500c8cb7ebabce73777c79c33074e679ab5.tar.bz2 | |
ENH: Enable use of COMPILE_DEFINITIONS property for Fortran sources.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeFortranInformation.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-ifort.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake index 09880c1..b4db0e3 100644 --- a/Modules/CMakeFortranInformation.cmake +++ b/Modules/CMakeFortranInformation.cmake @@ -124,7 +124,7 @@ ENDIF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY) # compile a Fortran file into an object file IF(NOT CMAKE_Fortran_COMPILE_OBJECT) SET(CMAKE_Fortran_COMPILE_OBJECT - "<CMAKE_Fortran_COMPILER> -o <OBJECT> <FLAGS> -c <SOURCE>") + "<CMAKE_Fortran_COMPILER> -o <OBJECT> <DEFINES> <FLAGS> -c <SOURCE>") ENDIF(NOT CMAKE_Fortran_COMPILE_OBJECT) # link a fortran program diff --git a/Modules/Platform/Windows-ifort.cmake b/Modules/Platform/Windows-ifort.cmake index 4c88910..7ea5581 100644 --- a/Modules/Platform/Windows-ifort.cmake +++ b/Modules/Platform/Windows-ifort.cmake @@ -19,7 +19,7 @@ SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY "lib ${CMAKE_CL_NOLOGO} <LINK_FLAGS> /o # compile a C++ file into an object file SET(CMAKE_Fortran_COMPILE_OBJECT - "<CMAKE_Fortran_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} /fpp /Fo<OBJECT> <FLAGS> -c <SOURCE>${CMAKE_END_TEMP_FILE}") + "<CMAKE_Fortran_COMPILER> ${CMAKE_START_TEMP_FILE} ${CMAKE_CL_NOLOGO} /fpp /Fo<OBJECT> <DEFINES> <FLAGS> -c <SOURCE>${CMAKE_END_TEMP_FILE}") SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") |