[Cmake-commits] [cmake-commits] hoffman committed Darwin.cmake 1.45 1.45.2.1 Linux-Intel-C.cmake NONE 1.1.2.2 Linux-Intel-CXX.cmake NONE 1.3.2.2 Linux-Intel-Fortran.cmake NONE 1.1.2.2 SunOS.cmake 1.24 1.24.2.1 Windows-ifort.cmake 1.6 1.6.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Darwin.cmake SunOS.cmake Windows-ifort.cmake 
Added Files:
      Tag: CMake-2-6
	Linux-Intel-C.cmake Linux-Intel-CXX.cmake 
	Linux-Intel-Fortran.cmake 
Log Message:
ENH: merge from cvs create yikes RC 10! (I hope this is the last RC...)


Index: SunOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/SunOS.cmake,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C 2 -d -r1.24 -r1.24.2.1
*** SunOS.cmake	27 Feb 2008 19:31:09 -0000	1.24
--- SunOS.cmake	1 May 2008 16:35:39 -0000	1.24.2.1
***************
*** 63,66 ****
--- 63,72 ----
  INCLUDE(Platform/UnixPaths)
  
+ # Add the compiler's implicit link directories.
+ IF("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
+   LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+     /opt/SUNWspro/lib /opt/SUNWspro/prod/lib /usr/ccs/lib)
+ ENDIF("${CMAKE_C_COMPILER_ID} ${CMAKE_CXX_COMPILER_ID}" MATCHES SunPro)
+ 
  IF(NOT CMAKE_COMPILER_IS_GNUCC)
    SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")

--- NEW FILE: Linux-Intel-Fortran.cmake ---
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")

--- NEW FILE: Linux-Intel-CXX.cmake ---
SET (CMAKE_CXX_FLAGS_INIT "")
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")

FIND_PROGRAM(XIAR xiar)
IF(XIAR) 
   SET(CMAKE_CXX_CREATE_STATIC_LIBRARY
      "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
      "${XIAR} -s <TARGET> ")
ENDIF(XIAR)
MARK_AS_ADVANCED(XIAR)

--- NEW FILE: Linux-Intel-C.cmake ---
SET (CMAKE_C_FLAGS_INIT "")
SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")

FIND_PROGRAM(XIAR xiar)
IF(XIAR)
  SET(CMAKE_C_CREATE_STATIC_LIBRARY
      "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
      "${XIAR} -s <TARGET> ")
ENDIF(XIAR)
MARK_AS_ADVANCED(XIAR)

Index: Windows-ifort.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-ifort.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** Windows-ifort.cmake	27 Feb 2008 22:10:44 -0000	1.6
--- Windows-ifort.cmake	1 May 2008 16:35:39 -0000	1.6.2.1
***************
*** 43,47 ****
  
  SET(CMAKE_BUILD_TYPE_INIT Debug)
! SET (CMAKE_Fortran_FLAGS_INIT "/W1")
  SET (CMAKE_Fortran_FLAGS_DEBUG_INIT "/debug:full")
  SET (CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "/O2 /D NDEBUG")
--- 43,47 ----
  
  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")

Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -C 2 -d -r1.45 -r1.45.2.1
*** Darwin.cmake	15 Feb 2008 16:22:23 -0000	1.45
--- Darwin.cmake	1 May 2008 16:35:38 -0000	1.45.2.1
***************
*** 58,61 ****
--- 58,62 ----
    LIST(REVERSE _CMAKE_OSX_SDKS)
    LIST(GET _CMAKE_OSX_SDKS 0 _CMAKE_OSX_SDKS)
+   SET(CMAKE_OSX_SYSROOT_DEFAULT "${_CMAKE_OSX_SDKS}")
    # use the environment variable CMAKE_OSX_SYSROOT if it is set
    IF(NOT "$ENV{CMAKE_OSX_SYSROOT}" STREQUAL "")