[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-250-g5e2bead
Brad King
brad.king at kitware.com
Wed Feb 24 09:36:34 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 5e2bead5a6cbffca6a3f50d1b52928f03981fb0a (commit)
via 572797f9843a76a101e2092c6ba31b5453bd23c6 (commit)
from 4cbf56e98c7c3ad3365350bd7ef9314263bb8862 (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=5e2bead5a6cbffca6a3f50d1b52928f03981fb0a
commit 5e2bead5a6cbffca6a3f50d1b52928f03981fb0a
Merge: 4cbf56e 572797f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 24 09:36:33 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 24 09:36:33 2016 -0500
Merge topic 'xcode-remove-reftype' into next
572797f9 Xcode: Write refType only for Xcode 1.5
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=572797f9843a76a101e2092c6ba31b5453bd23c6
commit 572797f9843a76a101e2092c6ba31b5453bd23c6
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Mon Feb 8 19:39:05 2016 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 24 09:35:54 2016 -0500
Xcode: Write refType only for Xcode 1.5
This field is not expected by newer versions.
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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list