[Cmake-commits] CMake branch, next, updated. v3.8.0-750-g841aa19
Kitware Robot
kwrobot at kitware.com
Wed Apr 12 15:55:02 EDT 2017
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 841aa193dbf995dc3b8983a37885e7ecc20d2080 (commit)
via 229abfc8f945421c9ad491dff674e41d283ca80f (commit)
via 63fbf587509c63395c024026b7bf264dbae446a1 (commit)
via 1afacebee9c42a0dccaf554db9cb048204913d38 (commit)
from 85797894702672d7da83888c6212b715c93a2577 (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=841aa193dbf995dc3b8983a37885e7ecc20d2080
commit 841aa193dbf995dc3b8983a37885e7ecc20d2080
Merge: 8579789 229abfc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 12 19:46:41 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Apr 12 15:46:46 2017 -0400
Stage topic 'xcode-remove-UseObjectLibraries'
Topic-id: 23637
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/698
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=229abfc8f945421c9ad491dff674e41d283ca80f
commit 229abfc8f945421c9ad491dff674e41d283ca80f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 12 15:37:06 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 12 15:38:54 2017 -0400
cmGeneratorTarget: Drop unused UseObjectLibraries method
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 74d863d..cbaedb1 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1937,41 +1937,6 @@ bool cmGeneratorTarget::IsDLLPlatform() const
return this->DLLPlatform;
}
-void cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs,
- const std::string& config) const
-{
- std::vector<cmSourceFile const*> objectFiles;
- this->GetExternalObjects(objectFiles, config);
- std::vector<cmGeneratorTarget*> objectLibraries;
- for (std::vector<cmSourceFile const*>::const_iterator it =
- objectFiles.begin();
- it != objectFiles.end(); ++it) {
- std::string objLib = (*it)->GetObjectLibrary();
- if (cmGeneratorTarget* tgt =
- this->LocalGenerator->FindGeneratorTargetToUse(objLib)) {
- objectLibraries.push_back(tgt);
- }
- }
-
- std::vector<cmGeneratorTarget*>::const_iterator end =
- cmRemoveDuplicates(objectLibraries);
-
- for (std::vector<cmGeneratorTarget*>::const_iterator ti =
- objectLibraries.begin();
- ti != end; ++ti) {
- cmGeneratorTarget* ogt = *ti;
- std::vector<cmSourceFile const*> objectSources;
- ogt->GetObjectSources(objectSources, config);
- for (std::vector<cmSourceFile const*>::const_iterator si =
- objectSources.begin();
- si != objectSources.end(); ++si) {
- std::string obj = ogt->ObjectDirectory;
- obj += ogt->Objects[*si];
- objs.push_back(obj);
- }
- }
-}
-
void cmGeneratorTarget::GetAutoUicOptions(std::vector<std::string>& result,
const std::string& config) const
{
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 3b9819d..38ece2c 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -347,9 +347,6 @@ public:
time config name placeholder if needed for the generator. */
std::string ObjectDirectory;
- void UseObjectLibraries(std::vector<std::string>& objs,
- const std::string& config) const;
-
void GetAppleArchs(const std::string& config,
std::vector<std::string>& archVec) const;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63fbf587509c63395c024026b7bf264dbae446a1
commit 63fbf587509c63395c024026b7bf264dbae446a1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 12 15:11:57 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 12 15:38:35 2017 -0400
Xcode: Inline relevant parts of UseObjectLibraries
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b7ff7f3..9d1f771 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1051,11 +1051,14 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets(
// Add object library contents as external objects. (Equivalent to
// the externalObjFiles above, except each one is not a cmSourceFile
// within the target.)
- std::vector<std::string> objs;
- gtgt->UseObjectLibraries(objs, "");
- for (std::vector<std::string>::const_iterator oi = objs.begin();
+ std::vector<cmSourceFile const*> objs;
+ gtgt->GetExternalObjects(objs, "");
+ for (std::vector<cmSourceFile const*>::const_iterator oi = objs.begin();
oi != objs.end(); ++oi) {
- std::string obj = *oi;
+ if ((*oi)->GetObjectLibrary().empty()) {
+ continue;
+ }
+ std::string const& obj = (*oi)->GetFullPath();
cmXCodeObject* xsf =
this->CreateXCodeSourceFileFromPath(obj, gtgt, "", 0);
externalObjFiles.push_back(xsf);
@@ -2669,13 +2672,16 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
// Add object library contents as link flags.
std::string linkObjs;
const char* sep = "";
- std::vector<std::string> objs;
- gt->UseObjectLibraries(objs, "");
- for (std::vector<std::string>::const_iterator oi = objs.begin();
+ std::vector<cmSourceFile const*> objs;
+ gt->GetExternalObjects(objs, "");
+ for (std::vector<cmSourceFile const*>::const_iterator oi = objs.begin();
oi != objs.end(); ++oi) {
+ if ((*oi)->GetObjectLibrary().empty()) {
+ continue;
+ }
linkObjs += sep;
sep = " ";
- linkObjs += this->XCodeEscapePath(*oi);
+ linkObjs += this->XCodeEscapePath((*oi)->GetFullPath());
}
this->AppendBuildSettingAttribute(
target, this->GetTargetLinkFlagsVar(gt), linkObjs.c_str(), configName);
@@ -2801,11 +2807,15 @@ bool cmGlobalXCodeGenerator::CreateGroups(
if (this->XcodeVersion < 50) {
// Put OBJECT_LIBRARY objects in proper groups:
- std::vector<std::string> objs;
- gtgt->UseObjectLibraries(objs, "");
- for (std::vector<std::string>::const_iterator oi = objs.begin();
+ std::vector<cmSourceFile const*> objs;
+ gtgt->GetExternalObjects(objs, "");
+ for (std::vector<cmSourceFile const*>::const_iterator oi =
+ objs.begin();
oi != objs.end(); ++oi) {
- std::string const& source = *oi;
+ if ((*oi)->GetObjectLibrary().empty()) {
+ continue;
+ }
+ std::string const& source = (*oi)->GetFullPath();
cmSourceGroup* sourceGroup =
mf->FindSourceGroup(source.c_str(), sourceGroups);
cmXCodeObject* pbxgroup =
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1afacebee9c42a0dccaf554db9cb048204913d38
commit 1afacebee9c42a0dccaf554db9cb048204913d38
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 12 14:56:37 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 12 15:30:35 2017 -0400
Xcode: Do not add Object Libraries source group on Xcode >= 5
The group is always empty because on Xcode 5 and above we list
object library files directly on the link line and do not list
sources for them.
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index d07cc3d..b7ff7f3 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2799,17 +2799,20 @@ bool cmGlobalXCodeGenerator::CreateGroups(
this->GroupMap[key] = pbxgroup;
}
- // Put OBJECT_LIBRARY objects in proper groups:
- std::vector<std::string> objs;
- gtgt->UseObjectLibraries(objs, "");
- for (std::vector<std::string>::const_iterator oi = objs.begin();
- oi != objs.end(); ++oi) {
- std::string const& source = *oi;
- cmSourceGroup* sourceGroup =
- mf->FindSourceGroup(source.c_str(), sourceGroups);
- cmXCodeObject* pbxgroup = this->CreateOrGetPBXGroup(gtgt, sourceGroup);
- std::string key = GetGroupMapKeyFromPath(gtgt, source);
- this->GroupMap[key] = pbxgroup;
+ if (this->XcodeVersion < 50) {
+ // Put OBJECT_LIBRARY objects in proper groups:
+ std::vector<std::string> objs;
+ gtgt->UseObjectLibraries(objs, "");
+ for (std::vector<std::string>::const_iterator oi = objs.begin();
+ oi != objs.end(); ++oi) {
+ std::string const& source = *oi;
+ cmSourceGroup* sourceGroup =
+ mf->FindSourceGroup(source.c_str(), sourceGroups);
+ cmXCodeObject* pbxgroup =
+ this->CreateOrGetPBXGroup(gtgt, sourceGroup);
+ std::string key = GetGroupMapKeyFromPath(gtgt, source);
+ this->GroupMap[key] = pbxgroup;
+ }
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 35 -------------------------
Source/cmGeneratorTarget.h | 3 ---
Source/cmGlobalXCodeGenerator.cxx | 51 +++++++++++++++++++++++--------------
3 files changed, 32 insertions(+), 57 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list