summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-08-13 17:28:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-08-13 17:28:07 (GMT)
commitc1163632de2467f44c3774d401a04a76f1444c2f (patch)
tree4a02f471c292397d52865236e65b940233577d61 /Source
parent0d28661999feed72e00555a410184670dc82edf7 (diff)
parentb237dbd8c35c2ec7b43161612fd03e89d85756e6 (diff)
downloadCMake-c1163632de2467f44c3774d401a04a76f1444c2f.zip
CMake-c1163632de2467f44c3774d401a04a76f1444c2f.tar.gz
CMake-c1163632de2467f44c3774d401a04a76f1444c2f.tar.bz2
Merge topic 'xcode-object-dir'
b237dbd Xcode: Fix object library references in multi-project trees (#13452)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 938977b..c366bcb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3739,7 +3739,7 @@ cmGlobalXCodeGenerator
const char* configName = this->GetCMakeCFGIntDir();
std::string dir = this->GetObjectsNormalDirectory(
- this->CurrentProject, configName, gt->Target);
+ "$(PROJECT_NAME)", configName, gt->Target);
if(this->XcodeVersion >= 21)
{
dir += "$(CURRENT_ARCH)/";