[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-237-g634c780

Gregor Jasny gjasny at googlemail.com
Sun Feb 21 10:47:46 EST 2016


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  634c78061295a4633b7cdd651cbf6eed98642c84 (commit)
       via  c3c9374cd4128b309ca84d4c1629d7c43bbc94ee (commit)
       via  7e32bd945a9f32144ac63fdcd085197658229f9c (commit)
       via  6872a4fde02de182cdec6786d4630387dd22fddf (commit)
      from  9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc (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=634c78061295a4633b7cdd651cbf6eed98642c84
commit 634c78061295a4633b7cdd651cbf6eed98642c84
Merge: 9f72e3d c3c9374
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 21 10:47:45 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 21 10:47:45 2016 -0500

    Merge topic 'xcode-remove-reftype' into next
    
    c3c9374c Write refType only for Xcode 1.5
    7e32bd94 CMake Nightly Date Stamp
    6872a4fd CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3c9374cd4128b309ca84d4c1629d7c43bbc94ee
commit c3c9374cd4128b309ca84d4c1629d7c43bbc94ee
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Feb 8 19:39:05 2016 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Feb 21 16:44:30 2016 +0100

    Write refType only for Xcode 1.5

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 526e32f..ef18729 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2805,7 +2805,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt,
     fullName = gtgt->GetFullName(defConfig.c_str());
     }
   fileRef->AddAttribute("path", this->CreateString(fullName.c_str()));
-  fileRef->AddAttribute("refType", this->CreateString("0"));
+  if(this->XcodeVersion == 15)
+    {
+    fileRef->AddAttribute("refType", this->CreateString("0"));
+    }
   fileRef->AddAttribute("sourceTree",
                         this->CreateString("BUILT_PRODUCTS_DIR"));
   fileRef->SetComment(gtgt->GetName().c_str());

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list