[Cmake-commits] [cmake-commits] king committed Darwin.cmake 1.54 1.55

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Jan 29 13:42:00 EST 2009


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

Modified Files:
	Darwin.cmake 
Log Message:
BUG: Fix OS X dylib version flags for more linkers

Some OS X linkers want a 'dylib_' prefix on the -compatiblity_version
and -current_version flags while others do not.  This passes the flags
through gcc instead since it never wants the prefix and translates the
flags for the linker correctly.


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.54
retrieving revision 1.55
diff -C 2 -d -r1.54 -r1.55
*** Darwin.cmake	28 Jan 2009 11:10:12 -0000	1.54
--- Darwin.cmake	29 Jan 2009 18:41:58 -0000	1.55
***************
*** 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}")



More information about the Cmake-commits mailing list