[Cmake-commits] [cmake-commits] king committed Windows-ifort.cmake 1.9 1.10

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv25937/Modules/Platform

Modified Files:
	Windows-ifort.cmake 
Log Message:
Fix flags for Intel Fortran on Windows

We replace "/MD" with ifort-specific flags as follows:

  /MD  -> /threads /libs:dll
  /MDd -> /threads /libs:dll /dbglibs

We also enable the "/MD" equivalent for all Fortran configurations.
Previously multithreaded dll runtimes were used for release builds and
threaded static runtimes for debug builds.  For mixed Fortran C/C++
projects, this led to link warnings for Debug but not for Release.

See issue #8744.


Index: Windows-ifort.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-ifort.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** Windows-ifort.cmake	26 Oct 2009 15:07:18 -0000	1.9
--- Windows-ifort.cmake	29 Oct 2009 14:06:10 -0000	1.10
***************
*** 54,61 ****
  
  SET(CMAKE_BUILD_TYPE_INIT Debug)
! SET (CMAKE_Fortran_FLAGS_INIT "/W1 /nologo /fpp")
! SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "/debug:full")
  SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O2 /D NDEBUG")
! SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "/MD /O1 /D NDEBUG")
  SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "/O1 /debug:full /D NDEBUG")
  
--- 54,61 ----
  
  SET(CMAKE_BUILD_TYPE_INIT Debug)
! SET (CMAKE_Fortran_FLAGS_INIT "/W1 /nologo /fpp /libs:dll /threads")
! SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "/debug:full /dbglibs")
  SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O2 /D NDEBUG")
! SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "/O1 /D NDEBUG")
  SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "/O1 /debug:full /D NDEBUG")