diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2007-05-09 14:28:32 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2007-05-09 14:28:32 (GMT) |
| commit | 181f4cb0aff97af0b5251ad3347e00efe7310ba9 (patch) | |
| tree | 47447732704028e8ad0396bcfc1240e3059bd4ca /Source | |
| parent | adcd87c976eede8e76234550beb89ca082a00ade (diff) | |
| download | CMake-181f4cb0aff97af0b5251ad3347e00efe7310ba9.zip CMake-181f4cb0aff97af0b5251ad3347e00efe7310ba9.tar.gz CMake-181f4cb0aff97af0b5251ad3347e00efe7310ba9.tar.bz2 | |
ENH: fix for older xcode and framework create
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 580aa5b..d7069c2 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1467,7 +1467,16 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, { // Get the install_name directory for the build tree. install_name_dir = target.GetInstallNameDirForBuildTree(configName); - + if(target.GetPropertyAsBool("FRAMEWORK")) + { + if(install_name_dir.find(".framework") != install_name_dir.npos) + { + install_name_dir = install_name_dir + "/.."; + install_name_dir = cmSystemTools::CollapseFullPath(install_name_dir.c_str()); + std::cerr << "new install name " << install_name_dir << "\n"; + } + } + if(install_name_dir.empty()) { // Xcode will not pass the -install_name option at all if INSTALL_PATH |