[Cmake-commits] [cmake-commits] hoffman committed Darwin.cmake 1.45.2.4 1.45.2.5 Haiku.cmake 1.1.2.3 1.1.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Darwin.cmake Haiku.cmake 
Log Message:
ENH: merge in a few more changes for RC 11


Index: Haiku.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Haiku.cmake,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C 2 -d -r1.1.2.3 -r1.1.2.4
*** Haiku.cmake	31 Dec 2008 15:14:29 -0000	1.1.2.3
--- Haiku.cmake	4 Feb 2009 22:04:49 -0000	1.1.2.4
***************
*** 18,20 ****
  LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
  LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
! 
--- 18,21 ----
  LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin)
  LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib)
! LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty)
! LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)

Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.45.2.4
retrieving revision 1.45.2.5
diff -C 2 -d -r1.45.2.4 -r1.45.2.5
*** Darwin.cmake	31 Dec 2008 15:14:29 -0000	1.45.2.4
--- Darwin.cmake	4 Feb 2009 22:04:49 -0000	1.45.2.5
***************
*** 28,33 ****
  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}")
--- 28,33 ----
  SET(CMAKE_DL_LIBS "")
  
! SET(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
! SET(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-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}")