Merge topic 'xcode-object-dir'

b237dbd Xcode: Fix object library references in multi-project trees (#13452)

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)/";

Tests/ObjectLibrary/A/CMakeLists.txt

@@ -1,3 +1,4 @@
+project(ObjectLibraryA)
 # Add -fPIC so objects can be used in shared libraries.
 # TODO: Need property for this.
 if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)

Tests/ObjectLibrary/B/CMakeLists.txt

@@ -1,3 +1,4 @@
+project(ObjectLibraryB)
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
   # VS 6 generator does not use per-target object locations.
   set(vs6 _vs6)