[Cmake-commits] [cmake-commits] hoffman committed Linux-Intel-Fortran.cmake 1.3.2.1 1.3.2.2 Windows-g77.cmake 1.3 1.3.2.1 Windows-ifort.cmake 1.8 1.8.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	Linux-Intel-Fortran.cmake Windows-g77.cmake 
	Windows-ifort.cmake 
Log Message:
RC 4 merge


Index: Windows-ifort.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-ifort.cmake,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** Windows-ifort.cmake	1 Sep 2009 20:33:51 -0000	1.8
--- Windows-ifort.cmake	28 Oct 2009 16:15:05 -0000	1.8.2.1
***************
*** 13,17 ****
  
  SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY 
!  "link ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE}  /out:<TARGET> /dll  <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_Fortran_CREATE_SHARED_MODULE ${CMAKE_Fortran_CREATE_SHARED_LIBRARY})
--- 13,17 ----
  
  SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY 
!  "link ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE}  /out:<TARGET> /implib:<TARGET_IMPLIB> /dll  <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_Fortran_CREATE_SHARED_MODULE ${CMAKE_Fortran_CREATE_SHARED_LIBRARY})
***************
*** 27,31 ****
  
  SET(CMAKE_Fortran_LINK_EXECUTABLE
!   "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
  
  INCLUDE(Platform/Windows-Intel)
--- 27,31 ----
  
  SET(CMAKE_Fortran_LINK_EXECUTABLE
!   "<CMAKE_Fortran_COMPILER> ${CMAKE_CL_NOLOGO} <OBJECTS> ${CMAKE_START_TEMP_FILE} <FLAGS> /Fe<TARGET> -link /implib:<TARGET_IMPLIB> <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
  
  INCLUDE(Platform/Windows-Intel)

Index: Windows-g77.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-g77.cmake,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** Windows-g77.cmake	11 Nov 2008 18:58:55 -0000	1.3
--- Windows-g77.cmake	28 Oct 2009 16:15:05 -0000	1.3.2.1
***************
*** 21,23 ****
  SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-02 -g")
  
! 
--- 21,24 ----
  SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT "-02 -g")
  
! SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY
!   "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")

Index: Linux-Intel-Fortran.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-Fortran.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** Linux-Intel-Fortran.cmake	9 Oct 2009 20:11:12 -0000	1.3.2.1
--- Linux-Intel-Fortran.cmake	28 Oct 2009 16:15:02 -0000	1.3.2.2
***************
*** 9,13 ****
  
  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,")
--- 9,13 ----
  
  SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS "-fPIC")
! SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS "-shared -i_dynamic -nofor_main")
  SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG "-Wl,-rpath,")