[Cmake-commits] [cmake-commits] hoffman committed Darwin.cmake 1.45.2.2 1.45.2.3 Windows-icl.cmake 1.4 1.4.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Darwin.cmake Windows-icl.cmake 
Log Message:
ENH: 2.6.2 rc 2 merge from main tree


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -C 2 -d -r1.45.2.2 -r1.45.2.3
*** Darwin.cmake	6 Aug 2008 21:04:18 -0000	1.45.2.2
--- Darwin.cmake	3 Sep 2008 13:43:16 -0000	1.45.2.3
***************
*** 68,72 ****
      SET(_CMAKE_OSX_SDKS "$ENV{CMAKE_OSX_SYSROOT}")
    ENDIF(NOT "$ENV{CMAKE_OSX_SYSROOT}" STREQUAL "") 
!   SET(CMAKE_OSX_SYSROOT ${_CMAKE_OSX_SDKS} CACHE STRING
      "isysroot used for universal binary support")
    # set _CMAKE_OSX_MACHINE to umame -m
--- 68,72 ----
      SET(_CMAKE_OSX_SDKS "$ENV{CMAKE_OSX_SYSROOT}")
    ENDIF(NOT "$ENV{CMAKE_OSX_SYSROOT}" STREQUAL "") 
!   SET(CMAKE_OSX_SYSROOT ${_CMAKE_OSX_SDKS} CACHE PATH
      "isysroot used for universal binary support")
    # set _CMAKE_OSX_MACHINE to umame -m

Index: Windows-icl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-icl.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** Windows-icl.cmake	14 Jan 2008 14:20:57 -0000	1.4
--- Windows-icl.cmake	3 Sep 2008 13:43:16 -0000	1.4.2.1
***************
*** 9,13 ****
  # create a shared C++ library
  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY 
!  "link ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE}  /out:<TARGET> /dll  <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY})
--- 9,13 ----
  # create a shared C++ library
  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY 
!  "xilink ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE}  /out:<TARGET> /dll  <LINK_FLAGS> <OBJECTS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
  
  SET(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY})