[Cmake-commits] [cmake-commits] hoffman committed Linux-GNU-Fortran.cmake 1.1 1.1.2.1 Linux-ifort.cmake 1.4 1.4.2.1 Windows-cl.cmake 1.84 1.84.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Linux-GNU-Fortran.cmake Linux-ifort.cmake Windows-cl.cmake 
Log Message:
ENH: move head to branch


Index: Linux-GNU-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-GNU-Fortran.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** Linux-GNU-Fortran.cmake	30 Dec 2007 21:11:37 -0000	1.1
--- Linux-GNU-Fortran.cmake	18 Mar 2008 14:23:52 -0000	1.1.2.1
***************
*** 1 ****
--- 1,16 ----
  SET(CMAKE_Fortran_MODDIR_FLAG -J)
+ SET (CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")     # -pic
+ SET (CMAKE_Fortran_FLAGS_INIT "")
+ SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "-g")
+ SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os")
+ SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3")
+ SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+ 
+ IF(NOT APPLE)
+   SET (CMAKE_INCLUDE_SYSTEM_FLAG_Fortran "-isystem ")
+ ENDIF(NOT APPLE)
+ 
+ # These will require updates to CMake C++ code to support
+ # preprocessing rules for Fortran.
+ #SET (CMAKE_Fortran_CREATE_PREPROCESSED_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+ #SET (CMAKE_Fortran_CREATE_ASSEMBLY_SOURCE "<CMAKE_Fortran_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")

Index: Linux-ifort.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-ifort.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** Linux-ifort.cmake	30 Dec 2007 21:11:37 -0000	1.4
--- Linux-ifort.cmake	18 Mar 2008 14:23:53 -0000	1.4.2.1
***************
*** 1,8 ****
  SET(CMAKE_DL_LIBS "dl")
! SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")        
  SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared")
! SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")  
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-Wl,-rpath,")
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ":")
  SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
  SET(CMAKE_Fortran_MODDIR_FLAG "-module ")
--- 1,14 ----
  SET(CMAKE_DL_LIBS "dl")
! SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")
  SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared")
! SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-Wl,-rpath,")
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ":")
  SET(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG "-Wl,-soname,")
  SET(CMAKE_Fortran_MODDIR_FLAG "-module ")
+ 
+ SET (CMAKE_Fortran_FLAGS_INIT "")
+ SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "-g")
+ SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os")
+ SET (CMAKE_Fortran_FLAGS_RELEASE_INIT "-O3")
+ SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")

Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -C 2 -d -r1.84 -r1.84.2.1
*** Windows-cl.cmake	1 Mar 2008 14:08:34 -0000	1.84
--- Windows-cl.cmake	18 Mar 2008 14:23:53 -0000	1.84.2.1
***************
*** 201,213 ****
      SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR")
      SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi  /Ob0 /Od /GZ")
!     SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1")
!     SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MT /O2 /Ob2")
!     SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1")
!     SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR")
      SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi  /Ob0 /Od /GZ")
!     SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1")
!     SET (CMAKE_C_FLAGS_RELEASE_INIT "/MT /O2 /Ob2")
!     SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1")
!     SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib advapi32.lib rpcrt4.lib")
    ELSE(CMAKE_USING_VC_FREE_TOOLS)
      SET(CMAKE_BUILD_TYPE_INIT Debug)
--- 201,212 ----
      SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR")
      SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi  /Ob0 /Od /GZ")
!     SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG")
!     SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG")
!     SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG")
!     SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000")
      SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi  /Ob0 /Od /GZ")
!     SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG")
!     SET (CMAKE_C_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG")
!     SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG")
    ELSE(CMAKE_USING_VC_FREE_TOOLS)
      SET(CMAKE_BUILD_TYPE_INIT Debug)
***************
*** 222,227 ****
      SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG")
      SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
-     SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
    ENDIF(CMAKE_USING_VC_FREE_TOOLS)
  ENDIF(MSVC_VERSION GREATER 1310)
  
--- 221,226 ----
      SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG")
      SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
    ENDIF(CMAKE_USING_VC_FREE_TOOLS)
+   SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
  ENDIF(MSVC_VERSION GREATER 1310)