[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1195-gea6edbc

[Stephen Kelly]

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  ea6edbcd8f9b7d6ce552aaf8bb93570d8eca17b1 (commit)
       via  be3c1b812b2175275d43d13f5ba54d5bcdb2d994 (commit)
       via  6efc5a37953a40048d235337e4d40c46b7088f03 (commit)
      from  2ea7a2addb67513ca864a1521c8f43817d9cf720 (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=ea6edbcd8f9b7d6ce552aaf8bb93570d8eca17b1
commit ea6edbcd8f9b7d6ce552aaf8bb93570d8eca17b1
Merge: 2ea7a2a be3c1b8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 08:13:42 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 19 08:13:42 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    be3c1b81 Fix Xcode object handling.
    6efc5a37 Fix check script.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be3c1b812b2175275d43d13f5ba54d5bcdb2d994
commit be3c1b812b2175275d43d13f5ba54d5bcdb2d994
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 13:12:33 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 19 13:12:33 2014 +0100

    Fix Xcode object handling.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c71cb81..d9d4927 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1009,7 +1009,10 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
       if(filetype &&
          filetype->GetString() == "compiled.mach-o.objfile")
         {
-        externalObjFiles.push_back(xsf);
+        if ((*i)->GetObjectLibrary().empty())
+          {
+          externalObjFiles.push_back(xsf);
+          }
         }
       else if(this->IsHeaderFile(*i) ||
         (tsFlags.Type == cmGeneratorTarget::SourceFileTypePrivateHeader) ||

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6efc5a37953a40048d235337e4d40c46b7088f03
commit 6efc5a37953a40048d235337e4d40c46b7088f03
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 19 12:33:09 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 19 12:33:09 2014 +0100

    Fix check script.

diff --git a/Tests/GeneratorExpression/check_object_files.cmake b/Tests/GeneratorExpression/check_object_files.cmake
index fc8c972..889fe80 100644
--- a/Tests/GeneratorExpression/check_object_files.cmake
+++ b/Tests/GeneratorExpression/check_object_files.cmake
@@ -29,7 +29,7 @@ foreach(objlib_file ${objlib_files})
       set(file_exists True)
     else()
       foreach(config_macro "$(Configuration)" "$(OutDir)" "$(IntDir)")
-        string(REPLACE "${config_macro}" "${TEST_CONFIGURATION}" config_file "${config_file}")
+        string(REPLACE "${config_macro}" "${TEST_CONFIGURATION}" config_file "${objlib_file}")
         list(APPEND attempts ${config_file})
         if (EXISTS ${config_file})
           set(file_exists True)

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx                  |    5 ++++-
 Tests/GeneratorExpression/check_object_files.cmake |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake