diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-22 14:42:05 -0400 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-22 14:42:05 -0400 |
| commit | 692ba48c4e5762b370f2999e902b8bd677c77161 (patch) | |
| tree | 0c9465d0e38a15bd0cb043f234b4e4ab0cee51a2 /Modules/CMakeFortranInformation.cmake | |
| parent | 597185754420db18d83b2c9e3b9f1e33675bd935 (diff) | |
| download | cmake-692ba48c4e5762b370f2999e902b8bd677c77161.tar.gz | |
ENH: major changes to support addition of languages from cmake modules directory.
Diffstat (limited to 'Modules/CMakeFortranInformation.cmake')
| -rw-r--r-- | Modules/CMakeFortranInformation.cmake | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake index fa4894af95..8e6b205146 100644 --- a/Modules/CMakeFortranInformation.cmake +++ b/Modules/CMakeFortranInformation.cmake @@ -24,15 +24,15 @@ IF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS) ENDIF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS) IF(NOT CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS) - SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_FLAGS}) + SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS) IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG) - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_FLAG}) + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG) IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP) - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP}) + SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP) # repeat for modules @@ -49,13 +49,21 @@ IF(NOT CMAKE_SHARED_MODULE_LINK_Fortran_FLAGS) ENDIF(NOT CMAKE_SHARED_MODULE_LINK_Fortran_FLAGS) IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG) - SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_FLAG}) + SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG}) ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG) IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP) - SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_FLAG_SEP}) + SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP) +IF(NOT CMAKE_INCLUDE_FLAG_Fortran) + SET(CMAKE_INCLUDE_FLAG_Fortran ${CMAKE_INCLUDE_FLAG_C}) +ENDIF(NOT CMAKE_INCLUDE_FLAG_Fortran) + +IF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran) + SET(CMAKE_INCLUDE_FLAG_SEP_Fortran ${CMAKE_INCLUDE_FLAG_SEP_C}) +ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran) + SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_ENV_INIT} $ENV{FFLAGS} ${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING |