diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-04-07 20:09:13 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-04-07 20:09:13 (GMT) |
| commit | f50e904fafb84dc6ce21698cfd53bb330c0aeb20 (patch) | |
| tree | 05fdb19e3b318328a1430c328851db849be172b0 | |
| parent | 5fb834217794525925a822d3cd7cc2e372555a75 (diff) | |
| download | CMake-f50e904fafb84dc6ce21698cfd53bb330c0aeb20.zip CMake-f50e904fafb84dc6ce21698cfd53bb330c0aeb20.tar.gz CMake-f50e904fafb84dc6ce21698cfd53bb330c0aeb20.tar.bz2 | |
ENH: fix install test with xcode, the xcode generator does not support library versioning yet
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 8 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 8148e30..97d6fec 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -12,9 +12,11 @@ IF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$") "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress") ENDIF("${CMAKE_BACKWARDS_COMPATIBILITY}" MATCHES "^1\\.[0-6]$") -# Enable shared library versioning. -SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-install_name") -SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-install_name") +IF(NOT XCODE) +# Enable shar ed library versioning. + 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 # be specified in the soname field of a dylib. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 6848dd1..0168ebf 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -42,6 +42,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const& lang, cmMakefile * mf) { + mf->AddDefinition("XCODE","1"); mf->AddDefinition("CMAKE_CFG_INTDIR","."); mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++"); |