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

ENH: move hack to fix "new cmake on old build tree on OSX doesn't have CMAKE_INSTALL_NAME_TOOL in the cache" from

Browse Source 
cmInstallTargetGenerator.cxx to Darwin.cmake

Alex
This commit is contained in:
Alexander Neundorf 2007-05-18 11:57:29 -04:00
parent d64dc9b5bb
commit a18d286635
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Platform/Darwin.cmake
View File

@ -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_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") 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 # setup for universal binaries if sysroot exists
IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
# set the sysroot to be used if CMAKE_OSX_ARCHITECTURES # set the sysroot to be used if CMAKE_OSX_ARCHITECTURES

8
Source/cmInstallTargetGenerator.cxx
View File

@ -349,14 +349,6 @@ void cmInstallTargetGenerator
std::string installNameTool = std::string installNameTool =
this->Target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL"); this->Target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_NAME_TOOL");
// hack: if a new cmake runs on an old build tree, CMAKE_INSTALL_NAME_TOOL
// isn't in the cache, because it was simply hardcoded. To make this work
// adjust it here.
if((this->Target->GetMakefile()->IsOn("APPLE")) && (!installNameTool.size()))
{
installNameTool = "install_name_tool";
}
if(!installNameTool.size()) if(!installNameTool.size())
{ {
return; return;