[Cmake-commits] [cmake-commits] hoffman committed Darwin.cmake 1.45.2.1 1.45.2.2 Linux-Intel-C.cmake 1.1.2.2 1.1.2.3 Linux-Intel-CXX.cmake 1.3.2.2 1.3.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Darwin.cmake Linux-Intel-C.cmake Linux-Intel-CXX.cmake 
Log Message:
ENH: merge in fixes from main tree 2.6.2 RC 1


Index: Linux-Intel-C.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-C.cmake,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** Linux-Intel-C.cmake	1 May 2008 16:35:39 -0000	1.1.2.2
--- Linux-Intel-C.cmake	6 Aug 2008 21:04:19 -0000	1.1.2.3
***************
*** 5,8 ****
--- 5,11 ----
  SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
  
+ SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+ SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
+ 
  FIND_PROGRAM(XIAR xiar)
  IF(XIAR)

Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -C 2 -d -r1.45.2.1 -r1.45.2.2
*** Darwin.cmake	1 May 2008 16:35:38 -0000	1.45.2.1
--- Darwin.cmake	6 Aug 2008 21:04:18 -0000	1.45.2.2
***************
*** 28,31 ****
--- 28,36 ----
  SET(CMAKE_DL_LIBS "")
  
+ SET(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG -Wl,-compatibility_version,)
+ SET(CMAKE_C_OSX_CURRENT_VERSION_FLAG -Wl,-current_version,)
+ SET(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
+ SET(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
+ 
  SET(CMAKE_C_LINK_FLAGS "-headerpad_max_install_names")
  SET(CMAKE_CXX_LINK_FLAGS "-headerpad_max_install_names")

Index: Linux-Intel-CXX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux-Intel-CXX.cmake,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C 2 -d -r1.3.2.2 -r1.3.2.3
*** Linux-Intel-CXX.cmake	1 May 2008 16:35:39 -0000	1.3.2.2
--- Linux-Intel-CXX.cmake	6 Aug 2008 21:04:19 -0000	1.3.2.3
***************
*** 5,8 ****
--- 5,11 ----
  SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
  
+ SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+ SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
+ 
  FIND_PROGRAM(XIAR xiar)
  IF(XIAR)