From 44ab336a0c4afe9dab6e7d038aec9a27c7ee92c7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 3 May 2007 08:24:32 -0400 Subject: ENH: Merging CompilerId updates from branch CMake-Modules-CompilerId to the main tree. Changes between CMake-Modules-CompilerId-mp1 and CMake-Modules-CompilerId-mp2 are included. --- Modules/CMakeFortranCompiler.cmake.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Modules/CMakeFortranCompiler.cmake.in') diff --git a/Modules/CMakeFortranCompiler.cmake.in b/Modules/CMakeFortranCompiler.cmake.in index a97717acb0..a4f3941bad 100644 --- a/Modules/CMakeFortranCompiler.cmake.in +++ b/Modules/CMakeFortranCompiler.cmake.in @@ -1,5 +1,7 @@ SET(CMAKE_Fortran_COMPILER "@CMAKE_Fortran_COMPILER@") SET(CMAKE_Fortran_COMPILER_ARG1 "@CMAKE_Fortran_COMPILER_ARG1@") +SET(CMAKE_Fortran_COMPILER_ID "@CMAKE_Fortran_COMPILER_ID@") +SET(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@") SET(CMAKE_AR "@CMAKE_AR@") SET(CMAKE_RANLIB "@CMAKE_RANLIB@") SET(CMAKE_COMPILER_IS_GNUG77 @CMAKE_COMPILER_IS_GNUG77@) @@ -11,10 +13,12 @@ IF(CMAKE_COMPILER_IS_CYGWIN) SET(UNIX 1) ENDIF(CMAKE_COMPILER_IS_CYGWIN) +SET(CMAKE_Fortran_COMPILER_ENV_VAR "FC") + IF(CMAKE_COMPILER_IS_MINGW) SET(MINGW 1) ENDIF(CMAKE_COMPILER_IS_MINGW) -SET(CMAKE_COMPILER_IS_GNUG77_RUN 1) +SET(CMAKE_Fortran_COMPILER_ID_RUN 1) SET(CMAKE_Fortran_SOURCE_FILE_EXTENSIONS f;F;f77;F77;f90;F90;for;f95;F95) SET(CMAKE_Fortran_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) SET(CMAKE_Fortran_LINKER_PREFERENCE Prefered) @@ -23,4 +27,3 @@ IF(UNIX) ELSE(UNIX) SET(CMAKE_Fortran_OUTPUT_EXTENSION .obj) ENDIF(UNIX) -SET(CMAKE_Fortran_COMPILER_ENV_VAR "FC") -- cgit v1.2.1