浏览代码

ENH: minor fortran fixes

Bill Hoffman 21 年之前
父节点
当前提交
a1b94f4c5c
共有 2 个文件被更改,包括 11 次插入4 次删除
  1. 6 0
      Modules/CMakeSystemSpecificInformation.cmake
  2. 5 4
      Modules/CMakeTestFortranCompiler.cmake

+ 6 - 0
Modules/CMakeSystemSpecificInformation.cmake

@@ -302,6 +302,12 @@ CMAKE_C_FLAGS_MINSIZEREL
 CMAKE_C_FLAGS_RELEASE
 CMAKE_C_FLAGS_RELEASE
 CMAKE_C_FLAGS_RELWITHDEBINFO
 CMAKE_C_FLAGS_RELWITHDEBINFO
 
 
+CMAKE_FORTRAN_FLAGS
+CMAKE_FORTRAN_FLAGS_DEBUG
+CMAKE_FORTRAN_FLAGS_MINSIZEREL
+CMAKE_FORTRAN_FLAGS_RELEASE
+CMAKE_FORTRAN_FLAGS_RELWITHDEBINFO
+
 CMAKE_EXE_LINKER_FLAGS
 CMAKE_EXE_LINKER_FLAGS
 CMAKE_EXE_LINKER_FLAGS_DEBUG
 CMAKE_EXE_LINKER_FLAGS_DEBUG
 CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
 CMAKE_EXE_LINKER_FLAGS_MINSIZEREL

+ 5 - 4
Modules/CMakeTestFortranCompiler.cmake

@@ -5,10 +5,11 @@
 # any makefiles or projects.
 # any makefiles or projects.
 IF(NOT CMAKE_FORTRAN_COMPILER_WORKS)
 IF(NOT CMAKE_FORTRAN_COMPILER_WORKS)
   MESSAGE(STATUS "Check for working Fortran compiler: ${CMAKE_FORTRAN_COMPILER}")
   MESSAGE(STATUS "Check for working Fortran compiler: ${CMAKE_FORTRAN_COMPILER}")
-  FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/testFortranCompiler.f
-    "\tPROGRAM TESTFORTRAN\n"
-    "\tPRINT *, 'Hello'\n"
-    "\tEND\n")
+  FILE(WRITE ${CMAKE_BINARY_DIR}/CMakeTmp/testFortranCompiler.f "
+        PROGRAM TESTFORTRAN
+        PRINT *, 'Hello'
+        END
+  ")
   TRY_COMPILE(CMAKE_FORTRAN_COMPILER_WORKS ${CMAKE_BINARY_DIR} 
   TRY_COMPILE(CMAKE_FORTRAN_COMPILER_WORKS ${CMAKE_BINARY_DIR} 
     ${CMAKE_BINARY_DIR}/CMakeTmp/testFortranCompiler.f
     ${CMAKE_BINARY_DIR}/CMakeTmp/testFortranCompiler.f
     OUTPUT_VARIABLE OUTPUT)
     OUTPUT_VARIABLE OUTPUT)