diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-05-18 15:57:29 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-05-18 15:57:29 (GMT) |
| commit | a18d286635aed4feac32d64b589b528422e7eb6c (patch) | |
| tree | 38f6b5b7f211820ea5d9ac95288ca6eb0946a468 /Modules/Platform/Darwin.cmake | |
| parent | d64dc9b5bb23bbd7aa2f4b8673f0d02c4a8b73b6 (diff) | |
| download | CMake-a18d286635aed4feac32d64b589b528422e7eb6c.zip CMake-a18d286635aed4feac32d64b589b528422e7eb6c.tar.gz CMake-a18d286635aed4feac32d64b589b528422e7eb6c.tar.bz2 | |
ENH: move hack to fix "new cmake on old build tree on OSX doesn't have CMAKE_INSTALL_NAME_TOOL in the cache" from
cmInstallTargetGenerator.cxx to Darwin.cmake
Alex
Diffstat (limited to 'Modules/Platform/Darwin.cmake')
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index adff353..8e5e949 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -13,6 +13,15 @@ SET(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") +# hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree +# (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache +# and still cmake didn't fail in CMakeFindBinUtils.cmake (because it isn't rerun) +# hardcode CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did before, Alex +IF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + SET(CMAKE_INSTALL_NAME_TOOL install_name_tool) +ENDIF(NOT DEFINED CMAKE_INSTALL_NAME_TOOL) + + # setup for universal binaries if sysroot exists IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) # set the sysroot to be used if CMAKE_OSX_ARCHITECTURES |