[Cmake-commits] CMake branch, master, updated. v3.9.0-rc5-204-gb6cbbbe

[Kitware Robot]

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, master has been updated
       via  b6cbbbe129fdbbbb12e7ac39e1589e448fd86031 (commit)
       via  15c5d9a0dd6961f908ffd30bc32471905a3d2bda (commit)
       via  ab533e4851b1a9ac862af353e5013650f35360bf (commit)
       via  c2a6df94ed639de2192c8baf2350efb2a4fd9c50 (commit)
      from  bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6cbbbe129fdbbbb12e7ac39e1589e448fd86031
commit b6cbbbe129fdbbbb12e7ac39e1589e448fd86031
Merge: 15c5d9a ab533e4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 30 14:32:18 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 30 10:32:22 2017 -0400

    Merge topic 'server-mode-protocol-version-docs'
    
    ab533e48 Help: Document server-mode protocol versions more clearly
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1015


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15c5d9a0dd6961f908ffd30bc32471905a3d2bda
commit 15c5d9a0dd6961f908ffd30bc32471905a3d2bda
Merge: bcca01d c2a6df9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 30 14:31:51 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jun 30 10:32:02 2017 -0400

    Merge topic 'xcode-cross-sdk-object-libraries'
    
    c2a6df94 Xcode: Use correct Object Library paths for cross-SDK builds
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1016


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab533e4851b1a9ac862af353e5013650f35360bf
commit ab533e4851b1a9ac862af353e5013650f35360bf
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Thu Jun 29 10:29:19 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 29 09:58:49 2017 -0400

    Help: Document server-mode protocol versions more clearly

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index 9520cc1..6a68a1c 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -254,6 +254,11 @@ versions supported by the cmake server. These are JSON objects with "major" and
 as experimental. These will contain the "isExperimental" key set to true. Enabling
 these requires a special command line argument when starting the cmake server mode.
 
+Within a "major" version all "minor" versions are fully backwards compatible.
+New "minor" versions may introduce functionality in such a way that existing
+clients of the same "major" version will continue to work, provided they
+ignore keys in the output that they do not know about.
+
 Example::
 
   [== "CMake Server" ==[
@@ -268,6 +273,9 @@ The first request that the client may send to the server is of type "handshake".
 
 This request needs to pass one of the "supportedProtocolVersions" of the "hello"
 type response received earlier back to the server in the "protocolVersion" field.
+Giving the "major" version of the requested protocol version will make the server
+use the latest minor version of that protocol. Use this if you do not explicitly
+need to depend on a specific minor version.
 
 Each protocol version may request additional attributes to be present.
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2a6df94ed639de2192c8baf2350efb2a4fd9c50
commit c2a6df94ed639de2192c8baf2350efb2a4fd9c50
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Thu Jun 29 14:19:23 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 29 09:52:44 2017 -0400

    Xcode: Use correct Object Library paths for cross-SDK builds
    
    When calculating Object Library paths take a look at the
    `XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` property to enable builds with
    different SDKs. Otherwise a hard-coded architecture could be chosen.
    
    Fixes: #16040

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 45c1764..9037961 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -147,7 +147,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(
   this->XcodeBuildCommandInitialized = false;
 
   this->ObjectDirArchDefault = "$(CURRENT_ARCH)";
-  this->ComputeObjectDirArch();
+  this->ObjectDirArch = this->ObjectDirArchDefault;
 
   cm->GetState()->SetIsGeneratorMultiConfig(true);
 }
@@ -3087,12 +3087,12 @@ void cmGlobalXCodeGenerator::ComputeArchitectures(cmMakefile* mf)
     }
   }
 
-  this->ComputeObjectDirArch();
+  this->ComputeObjectDirArch(mf);
 }
 
-void cmGlobalXCodeGenerator::ComputeObjectDirArch()
+void cmGlobalXCodeGenerator::ComputeObjectDirArch(cmMakefile* mf)
 {
-  if (this->Architectures.size() > 1) {
+  if (this->Architectures.size() > 1 || this->UseEffectivePlatformName(mf)) {
     this->ObjectDirArch = "$(CURRENT_ARCH)";
   } else if (!this->Architectures.empty()) {
     this->ObjectDirArch = this->Architectures[0];
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index f38fa3c..e69793b 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -247,7 +247,7 @@ private:
                                         const cmGeneratorTarget* t) const;
 
   void ComputeArchitectures(cmMakefile* mf);
-  void ComputeObjectDirArch();
+  void ComputeObjectDirArch(cmMakefile* mf);
 
   void addObject(cmXCodeObject* obj);
   std::string PostBuildMakeTarget(std::string const& tName,

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

Summary of changes:
 Help/manual/cmake-server.7.rst    |    8 ++++++++
 Source/cmGlobalXCodeGenerator.cxx |    8 ++++----
 Source/cmGlobalXCodeGenerator.h   |    2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake