[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1201-gacd292f

[Gregor Jasny]

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  acd292f497cb88d2212be5fe0752dadb05bc9c2a (commit)
       via  136104740663b3310616bec51b2cec7f807715ce (commit)
       via  a375702eaa961a496b9420a836c336d884e9cbf3 (commit)
      from  31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (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=acd292f497cb88d2212be5fe0752dadb05bc9c2a
commit acd292f497cb88d2212be5fe0752dadb05bc9c2a
Merge: 31e92e6 1361047
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 30 17:45:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 30 17:45:03 2015 -0400

    Merge topic 'xcode-lastupgradecheck' into next
    
    13610474 Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
    a375702e CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=136104740663b3310616bec51b2cec7f807715ce
commit 136104740663b3310616bec51b2cec7f807715ce
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Fri Oct 30 22:03:52 2015 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Fri Oct 30 22:28:04 2015 +0100

    Xcode: Set LastUpgradeCheck to current Xcode version (#15817)
    
    This prevents the project settings upgrade warning.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index da8c814..2df07cb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3398,6 +3398,9 @@ bool cmGlobalXCodeGenerator
     group = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
     group->AddAttribute("BuildIndependentTargetsInParallel",
                         this->CreateString("YES"));
+    std::ostringstream v;
+    v << std::setfill('0') << std::setw(4) << XcodeVersion * 10;
+    group->AddAttribute("LastUpgradeCheck", this->CreateString(v.str()));
     this->RootObject->AddAttribute("attributes", group);
     if (this->XcodeVersion >= 32)
       this->RootObject->AddAttribute("compatibilityVersion",

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmGlobalXCodeGenerator.cxx |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake