kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix install test with xcode, the xcode generator does not support library versioning yet

Browse Source
This commit is contained in:
Bill Hoffman 2005-04-07 16:09:13 -04:00
parent 5fb8342177
commit f50e904faf
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/Platform/Darwin.cmake
View File

@ -12,9 +12,11 @@ IF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
"${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress") "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress")
ENDIF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$") ENDIF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$")
# Enable shared library versioning. IF(NOT XCODE)
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name") # Enable shar ed library versioning.
SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name") SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name")
SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name")
ENDIF(NOT XCODE)
# OSX does not really implement an rpath, but it does allow a path to # OSX does not really implement an rpath, but it does allow a path to
# be specified in the soname field of a dylib. # be specified in the soname field of a dylib.

1
Source/cmGlobalXCodeGenerator.cxx
View File

@ -42,6 +42,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
lang, lang,
cmMakefile * mf) cmMakefile * mf)
{ {
mf->AddDefinition("XCODE","1");
mf->AddDefinition("CMAKE_CFG_INTDIR","."); mf->AddDefinition("CMAKE_CFG_INTDIR",".");
mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc"); mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");