[Cmake-commits] CMake branch, next, updated. v2.8.8-3613-g05e94e9

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  05e94e90f78aba45c6f9acaa900bfed9d0b7c77a (commit)
       via  b237dbd8c35c2ec7b43161612fd03e89d85756e6 (commit)
       via  896524e13f4989e85398e28850221f2fa93293f5 (commit)
       via  33b7f583a5483a39d47e3939332e06bac62dfaa3 (commit)
       via  5adfe691a9fed017ccf89539eaff7db77ac34e8c (commit)
      from  fe30d91f29694d4b237308ac993c7b9399611f42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05e94e90f78aba45c6f9acaa900bfed9d0b7c77a
commit 05e94e90f78aba45c6f9acaa900bfed9d0b7c77a
Merge: fe30d91 b237dbd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 3 10:29:15 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 3 10:29:15 2012 -0400

    Merge topic 'xcode-object-dir' into next
    
    b237dbd Xcode: Fix object library references in multi-project trees (#13452)
    896524e CMake Nightly Date Stamp
    33b7f58 CMake Nightly Date Stamp
    5adfe69 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b237dbd8c35c2ec7b43161612fd03e89d85756e6
commit b237dbd8c35c2ec7b43161612fd03e89d85756e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 3 08:58:48 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 3 10:17:49 2012 -0400

    Xcode: Fix object library references in multi-project trees (#13452)
    
    In cmGlobalXCodeGenerator::Generate we generate a .xcodeproj for each
    directory in the tree containing a project() command.  First we
    iteratively use SetGenerationRoot to add "ALL_BUILD" and other targets
    to each project.  This leaves "CurrentProject" set to the last project
    when we invoke cmGlobalGenerator::Generate, which is not the same as the
    top-level project if any subdirectories invoke the project() command.
    
    When cmGlobalGenerator::Generate reaches CreateGeneratorTargets it
    constructs cmGeneratorTarget and calls ComputeTargetObjects exactly once
    per target.  In this context the value of CurrentProject is undefined so
    we cannot pass it to GetObjectsNormalDirectory.  Use "$(PROJECT_NAME)"
    instead so it will adapt automatically to each project.
    
    Also teach Tests/ObjectLibrary to cover this case.

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)/";
diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt
index 121a8ac..04ab02f 100644
--- a/Tests/ObjectLibrary/A/CMakeLists.txt
+++ b/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)
diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt
index 67172d1..4b0b07d 100644
--- a/Tests/ObjectLibrary/B/CMakeLists.txt
+++ b/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)

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake            |    2 +-
 Source/cmGlobalXCodeGenerator.cxx    |    2 +-
 Tests/ObjectLibrary/A/CMakeLists.txt |    1 +
 Tests/ObjectLibrary/B/CMakeLists.txt |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake