[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-930-g5633458
Stephen Kelly
steveire at gmail.com
Wed Mar 12 14:38:16 EDT 2014
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 5633458eaba33cda2ec25436bb408ad670d9e814 (commit)
via 34e88e8cff7b046b6953eb9eb8d72e5e4e639067 (commit)
via 06232ea50a61e362bdbcf53a83dabb1982283bc2 (commit)
via 50845598e36061715a3752de5b69a2320efe2750 (commit)
from e4891140bb3e9947f28c09668c69432b018586b7 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5633458eaba33cda2ec25436bb408ad670d9e814
commit 5633458eaba33cda2ec25436bb408ad670d9e814
Merge: e489114 34e88e8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 14:38:15 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 14:38:15 2014 -0400
Merge topic 'target-objects-refactor' into next
34e88e8c Revert "cmLocalGenerator: Add ComputeObjectFilename method."
06232ea5 Revert "cmGeneratorTarget: Remove GetObjectName method."
50845598 Revert "cmGeneratorTarget: Compute target objects in LookupObjectLibraries."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34e88e8cff7b046b6953eb9eb8d72e5e4e639067
commit 34e88e8cff7b046b6953eb9eb8d72e5e4e639067
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 19:37:44 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 12 19:37:44 2014 +0100
Revert "cmLocalGenerator: Add ComputeObjectFilename method."
This reverts commit f94cf6285b2317441753c8e425b465d86c8987e6.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 87cf0bb..edbaf92 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -3107,21 +3107,6 @@ void cmLocalGenerator::ComputeObjectFilenames(
}
//----------------------------------------------------------------------------
-void cmLocalGenerator::ComputeObjectFilename(
- cmSourceFile* src,
- std::string& name,
- const std::string& dir)
-{
- std::vector<cmSourceFile*> srcs;
- srcs.push_back(src);
- std::vector<std::string> names;
-
- this->ComputeObjectFilenames(srcs, names, dir);
- assert(names.size() == 1);
- name = names.front();
-}
-
-//----------------------------------------------------------------------------
void cmLocalGenerator::GetDirectoryForObjects(cmTarget* tgt, std::string& dir)
{
this->GetObjectDirectory(tgt, dir);
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index db1df0d..38e303a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -378,9 +378,6 @@ public:
const std::vector<cmSourceFile*>& objectSources,
std::vector<std::string>& objectFiles,
const std::string& dir);
- void ComputeObjectFilename(cmSourceFile* objectSource,
- std::string& objectFile,
- const std::string& dir);
protected:
///! put all the libraries for a target on into the given stream
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 78df95d..ce55068 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -404,13 +404,7 @@ void cmLocalVisualStudio6Generator
std::string objectNameDir;
if(this->HasExplicitObjectName(*sf))
{
- std::string dir_max;
- this->GetDirectoryForObjects(&target, dir_max);
-
- std::string objectName;
- this->ComputeObjectFilename(const_cast<cmSourceFile*>(*sf),
- objectName, dir_max);
- objectNameDir = cmSystemTools::GetFilenamePath(objectName);
+ objectNameDir = cmSystemTools::GetFilenamePath(gt->GetObjectName(*sf));
}
// Add per-source file flags.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 88085fa..8819361 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1484,11 +1484,7 @@ cmLocalVisualStudio7GeneratorFCInfo
std::string objectName;
if(lg->HasExplicitObjectName(&sf))
{
- std::string dir_max;
- lg->GetDirectoryForObjects(&target, dir_max);
-
- lg->ComputeObjectFilename(const_cast<cmSourceFile*>(&sf),
- objectName, dir_max);
+ objectName = gt->GetObjectName(&sf);
}
// Compute per-source, per-config information.
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 1634269..983fd99 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -431,12 +431,9 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
return;
}
- std::string dir_max;
- this->LocalGenerator->GetDirectoryForObjects(this->Target, dir_max);
-
- std::string objectName;
- this->LocalGenerator->ComputeObjectFilename(&source, objectName, dir_max);
-
+ // Get the full path name of the object file.
+ std::string const& objectName = this->GeneratorTarget
+ ->GetObjectName(&source);
std::string obj = this->LocalGenerator->GetTargetDirectory(*this->Target);
obj += "/";
obj += objectName;
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index e84065c..d652018 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -281,11 +281,8 @@ cmNinjaTargetGenerator
std::string path = this->LocalGenerator->GetHomeRelativeOutputPath();
if(!path.empty())
path += "/";
- std::string dir_max;
- this->LocalGenerator->GetDirectoryForObjects(this->Target, dir_max);
-
- std::string objectName;
- this->LocalGenerator->ComputeObjectFilename(source, objectName, dir_max);
+ std::string const& objectName = this->GeneratorTarget
+ ->GetObjectName(source);
path += this->LocalGenerator->GetTargetDirectory(*this->Target);
path += "/";
path += objectName;
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index aefd310..5bb3b36 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1096,9 +1096,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
std::string objectName;
if(this->LocalGenerator->HasExplicitObjectName(&sf))
{
- std::string dir_max;
- this->LocalGenerator->GetDirectoryForObjects(this->Target, dir_max);
- this->LocalGenerator->ComputeObjectFilename(&sf, objectName, dir_max);
+ objectName = this->GeneratorTarget->GetObjectName(&sf);
}
std::string flags;
std::string defines;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06232ea50a61e362bdbcf53a83dabb1982283bc2
commit 06232ea50a61e362bdbcf53a83dabb1982283bc2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 19:37:41 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 12 19:37:41 2014 +0100
Revert "cmGeneratorTarget: Remove GetObjectName method."
This reverts commit 32a6fdb59e1beb36c567a7fcfa83c7eebdef03e7.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 8804fac..83ba343 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -316,6 +316,11 @@ cmGeneratorTarget::GetObjectSources(std::vector<cmSourceFile*> &data) const
}
//----------------------------------------------------------------------------
+const std::string& cmGeneratorTarget::GetObjectName(cmSourceFile const* file)
+{
+ return this->Objects[file];
+}
+
void cmGeneratorTarget::AddObject(cmSourceFile *sf, std::string const&name)
{
this->Objects[sf] = name;
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index ceb38d5..8b6d7e5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -33,6 +33,7 @@ public:
void GetSourceFiles(std::vector<cmSourceFile*>& files) const;
void GetObjectSources(std::vector<cmSourceFile*> &) const;
+ const std::string& GetObjectName(cmSourceFile const* file);
void AddObject(cmSourceFile *sf, std::string const&name);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50845598e36061715a3752de5b69a2320efe2750
commit 50845598e36061715a3752de5b69a2320efe2750
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 12 19:37:38 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 12 19:37:38 2014 +0100
Revert "cmGeneratorTarget: Compute target objects in LookupObjectLibraries."
This reverts commit 46019f89e555341c2b42d824e947c8a9e1d32751.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6a1f734..8804fac 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -316,6 +316,12 @@ cmGeneratorTarget::GetObjectSources(std::vector<cmSourceFile*> &data) const
}
//----------------------------------------------------------------------------
+void cmGeneratorTarget::AddObject(cmSourceFile *sf, std::string const&name)
+{
+ this->Objects[sf] = name;
+}
+
+//----------------------------------------------------------------------------
void cmGeneratorTarget::GetIDLSources(std::vector<cmSourceFile*>& data) const
{
IMPLEMENT_VISIT(IDLSources);
@@ -523,29 +529,6 @@ void cmGeneratorTarget::LookupObjectLibraries()
return;
}
}
-
- // Compute full path to object file directory for this target.
- std::string obj_dir;
- this->LocalGenerator->GetObjectDirectory(this->Target, obj_dir);
- this->ObjectDirectory = obj_dir;
-
- std::string dir_max;
- this->LocalGenerator->GetDirectoryForObjects(this->Target, dir_max);
-
- std::vector<cmSourceFile*> objectSources;
- this->GetObjectSources(objectSources);
- std::vector<std::string> objects;
- this->LocalGenerator->ComputeObjectFilenames(objectSources,
- objects, dir_max);
- assert(objects.size() == objectSources.size());
- // Compute the name of each object file.
- std::vector<cmSourceFile*>::const_iterator srcIt = objectSources.begin();
- std::vector<std::string>::const_iterator objIt = objects.begin();
- for( ; srcIt != objectSources.end(), objIt != objects.end();
- ++srcIt, ++objIt)
- {
- this->Objects[*srcIt] = *objIt;
- }
}
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 5788abe..ceb38d5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -34,6 +34,8 @@ public:
void GetObjectSources(std::vector<cmSourceFile*> &) const;
+ void AddObject(cmSourceFile *sf, std::string const&name);
+
void GetResxSources(std::vector<cmSourceFile*>&) const;
void GetIDLSources(std::vector<cmSourceFile*>&) const;
void GetExternalObjects(std::vector<cmSourceFile*>&) const;
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index d0b7b69..b95ff81 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1450,6 +1450,7 @@ void cmGlobalGenerator::ComputeGeneratorTargetObjects()
}
cmGeneratorTarget* gt = ti->second;
gt->LookupObjectLibraries();
+ this->ComputeTargetObjects(gt);
}
}
}
@@ -1513,6 +1514,12 @@ cmGlobalGenerator::GetGeneratorTarget(cmTarget const* t) const
return ti->second;
}
+//----------------------------------------------------------------------------
+void cmGlobalGenerator::ComputeTargetObjects(cmGeneratorTarget*) const
+{
+ // Implemented in generator subclasses that need this.
+}
+
void cmGlobalGenerator::CheckLocalGenerators()
{
std::map<std::string, std::string> notFoundMap;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 762b536..91e71a8 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -441,6 +441,7 @@ private:
void CreateGeneratorTargets(cmMakefile* mf);
void CreateGeneratorTargets();
void ComputeGeneratorTargetObjects();
+ virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;
void ClearGeneratorMembers();
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6af4ef0..89d81de 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -631,6 +631,33 @@ std::string cmGlobalNinjaGenerator::GetEditCacheCommand() const
return cmSystemTools::GetCMakeGUICommand();
}
+// TODO: Refactor to combine with cmGlobalUnixMakefileGenerator3 impl.
+void cmGlobalNinjaGenerator::ComputeTargetObjects(cmGeneratorTarget* gt) const
+{
+ cmTarget* target = gt->Target;
+
+ // Compute full path to object file directory for this target.
+ std::string obj_dir;
+ gt->LocalGenerator->GetObjectDirectory(target, obj_dir);
+ gt->ObjectDirectory = obj_dir;
+
+ std::string dir_max;
+ gt->LocalGenerator->GetDirectoryForObjects(target, dir_max);
+
+ std::vector<cmSourceFile*> objectSources;
+ gt->GetObjectSources(objectSources);
+ std::vector<std::string> objects;
+ gt->LocalGenerator->ComputeObjectFilenames(objectSources,
+ objects, dir_max);
+ std::vector<cmSourceFile*>::const_iterator srcIt = objectSources.begin();
+ std::vector<std::string>::const_iterator objIt = objects.begin();
+ for( ; srcIt != objectSources.end(), objIt != objects.end();
+ ++srcIt, ++objIt)
+ {
+ gt->AddObject(*srcIt, *objIt);
+ }
+}
+
//----------------------------------------------------------------------------
// Private methods
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 787e3f4..7725cf3 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -310,6 +310,9 @@ protected:
private:
virtual std::string GetEditCacheCommand() const;
+ /// @see cmGlobalGenerator::ComputeTargetObjects
+ virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;
+
void OpenBuildFileStream();
void CloseBuildFileStream();
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index ee08ec8..ea65669 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -103,6 +103,34 @@ std::string cmGlobalUnixMakefileGenerator3::GetEditCacheCommand() const
return edit_cmd? edit_cmd : "";
}
+//----------------------------------------------------------------------------
+void
+cmGlobalUnixMakefileGenerator3
+::ComputeTargetObjects(cmGeneratorTarget* gt) const
+{
+ cmTarget* target = gt->Target;
+ // Compute full path to object file directory for this target.
+ std::string obj_dir;
+ gt->LocalGenerator->GetObjectDirectory(target, obj_dir);
+ gt->ObjectDirectory = obj_dir;
+
+ std::string dir_max;
+ gt->LocalGenerator->GetDirectoryForObjects(target, dir_max);
+
+ std::vector<cmSourceFile*> objectSources;
+ gt->GetObjectSources(objectSources);
+ std::vector<std::string> objects;
+ gt->LocalGenerator->ComputeObjectFilenames(objectSources,
+ objects, dir_max);
+ std::vector<cmSourceFile*>::const_iterator srcIt = objectSources.begin();
+ std::vector<std::string>::const_iterator objIt = objects.begin();
+ for( ; srcIt != objectSources.end(), objIt != objects.end();
+ ++srcIt, ++objIt)
+ {
+ gt->AddObject(*srcIt, *objIt);
+ }
+}
+
void cmGlobalUnixMakefileGenerator3::Configure()
{
// Initialize CMAKE_EDIT_COMMAND cache entry.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index b078651..8115176 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -198,6 +198,7 @@ protected:
private:
virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; }
virtual std::string GetEditCacheCommand() const;
+ virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;
};
#endif
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 587024d..3cee9e2 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -118,6 +118,32 @@ void cmGlobalVisualStudioGenerator::Generate()
}
//----------------------------------------------------------------------------
+void
+cmGlobalVisualStudioGenerator
+::ComputeTargetObjects(cmGeneratorTarget* gt) const
+{
+ std::string dir_max;
+ gt->LocalGenerator->GetDirectoryForObjects(gt->Target, dir_max);
+
+ std::vector<cmSourceFile*> objectSources;
+ gt->GetObjectSources(objectSources);
+ std::vector<std::string> objects;
+ gt->LocalGenerator->ComputeObjectFilenames(objectSources,
+ objects, dir_max);
+ std::vector<cmSourceFile*>::const_iterator srcIt = objectSources.begin();
+ std::vector<std::string>::const_iterator objIt = objects.begin();
+ for( ; srcIt != objectSources.end(), objIt != objects.end();
+ ++srcIt, ++objIt)
+ {
+ gt->AddObject(*srcIt, *objIt);
+ }
+
+ std::string dir;
+ gt->LocalGenerator->GetObjectDirectory(gt->Target, dir);
+ gt->ObjectDirectory = dir;
+}
+
+//----------------------------------------------------------------------------
bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile,
const std::string& regKeyBase,
std::string& nextAvailableSubKeyName);
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index e587f4f..7e8dcf8 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -116,6 +116,7 @@ private:
virtual std::string GetVSMakeProgram() = 0;
void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const {}
+ void ComputeTargetObjects(cmGeneratorTarget* gt) const;
void FollowLinkDepends(cmTarget const* target,
std::set<cmTarget const*>& linked);
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1923b05..2eef69d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3946,3 +3946,26 @@ bool cmGlobalXCodeGenerator::IsMultiConfig()
// Newer Xcode versions are multi config:
return true;
}
+
+ //----------------------------------------------------------------------------
+void
+cmGlobalXCodeGenerator
+::ComputeTargetObjects(cmGeneratorTarget* gt) const
+{
+ std::vector<cmSourceFile*> objectSources;
+ gt->GetObjectSources(objectSources);
+ std::vector<std::string> objects;
+ gt->LocalGenerator->ComputeObjectFilenames(objectSources,
+ objects, "");
+ std::vector<cmSourceFile*>::const_iterator srcIt = objectSources.begin();
+ std::vector<std::string>::const_iterator objIt = objects.begin();
+ for( ; srcIt != objectSources.end(), objIt != objects.end();
+ ++srcIt, ++objIt)
+ {
+ gt->AddObject(*srcIt, *objIt);
+ }
+
+ std::string dir;
+ gt->LocalGenerator->GetObjectDirectory(*gt->Target, dir);
+ gt->ObjectDirectory = dir;
+}
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index ee85117..655fb23 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -226,6 +226,7 @@ protected:
private:
void PrintCompilerAdvice(std::ostream&, std::string const&,
const char*) const {}
+ void ComputeTargetObjects(cmGeneratorTarget* gt) const;
void addObject(cmXCodeObject *obj);
std::string PostBuildMakeTarget(std::string const& tName,
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorTarget.cxx | 34 +++++++++-------------------
Source/cmGeneratorTarget.h | 3 +++
Source/cmGlobalGenerator.cxx | 7 ++++++
Source/cmGlobalGenerator.h | 1 +
Source/cmGlobalNinjaGenerator.cxx | 27 ++++++++++++++++++++++
Source/cmGlobalNinjaGenerator.h | 3 +++
Source/cmGlobalUnixMakefileGenerator3.cxx | 28 +++++++++++++++++++++++
Source/cmGlobalUnixMakefileGenerator3.h | 1 +
Source/cmGlobalVisualStudioGenerator.cxx | 26 +++++++++++++++++++++
Source/cmGlobalVisualStudioGenerator.h | 1 +
Source/cmGlobalXCodeGenerator.cxx | 23 +++++++++++++++++++
Source/cmGlobalXCodeGenerator.h | 1 +
Source/cmLocalGenerator.cxx | 15 ------------
Source/cmLocalGenerator.h | 3 ---
Source/cmLocalVisualStudio6Generator.cxx | 8 +------
Source/cmLocalVisualStudio7Generator.cxx | 6 +----
Source/cmMakefileTargetGenerator.cxx | 9 +++-----
Source/cmNinjaTargetGenerator.cxx | 7 ++----
Source/cmVisualStudio10TargetGenerator.cxx | 4 +---
19 files changed, 140 insertions(+), 67 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list