[Cmake-commits] CMake branch, next, updated. v2.8.12-4914-gcec727e
Stephen Kelly
steveire at gmail.com
Tue Nov 5 11:45:01 EST 2013
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 cec727efe60fffd0fd5a5beb61ce9ec86964980d (commit)
via 246d4269ef03116f265ab4edf9192d92d4bd553e (commit)
via 020ac2426b7a02d40885e96d346832cda1dea780 (commit)
from 41519f0ee7342fa6aa0c894cde09e922049143b8 (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=cec727efe60fffd0fd5a5beb61ce9ec86964980d
commit cec727efe60fffd0fd5a5beb61ce9ec86964980d
Merge: 41519f0 246d426
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 11:44:58 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 11:44:58 2013 -0500
Merge topic 'fix-autogen-definitions' into next
246d426 Revert "cmQtAutogen: Gather tool arguments after creating generator targets."
020ac24 Revert "Extract FinalizeTargetCompileDefinitions from cmGeneratorTarget."
diff --cc Source/cmGlobalGenerator.h
index d9d5e61,4d6e10f..4529060
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@@ -414,12 -412,10 +412,11 @@@ private
// Per-target generator information.
cmGeneratorTargetsType GeneratorTargets;
void CreateGeneratorTargets();
- void FinalizeTargetCompileDefinitions();
void ComputeGeneratorTargetObjects();
- void ClearGeneratorTargets();
virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;
+ void ClearGeneratorMembers();
+
// Cache directory content and target files to be built.
struct DirectoryContent: public std::set<cmStdString>
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=246d4269ef03116f265ab4edf9192d92d4bd553e
commit 246d4269ef03116f265ab4edf9192d92d4bd553e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 17:44:25 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 5 17:44:25 2013 +0100
Revert "cmQtAutogen: Gather tool arguments after creating generator targets."
This reverts commit 28ba5176d9cb13ba1793f9fc599038f92e6334f6.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 85c467d..eac54c3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1095,12 +1095,9 @@ void cmGlobalGenerator::Generate()
return;
}
-#ifdef CMAKE_BUILD_WITH_CMAKE
// Iterate through all targets and set up automoc for those which have
// the AUTOMOC, AUTOUIC or AUTORCC property set
- AutogensType autogens;
- this->CreateQtAutoGeneratorsTargets(autogens);
-#endif
+ this->CreateQtAutoGeneratorsTargets();
// For each existing cmLocalGenerator
unsigned int i;
@@ -1134,14 +1131,6 @@ void cmGlobalGenerator::Generate()
// Create per-target generator information.
this->CreateGeneratorTargets();
-#ifdef CMAKE_BUILD_WITH_CMAKE
- for (AutogensType::iterator it = autogens.begin(); it != autogens.end();
- ++it)
- {
- it->first.SetupAutoGenerateTarget(it->second);
- }
-#endif
-
// Trace the dependencies, after that no custom commands should be added
// because their dependencies might not be handled correctly
for (i = 0; i < this->LocalGenerators.size(); ++i)
@@ -1267,9 +1256,11 @@ bool cmGlobalGenerator::CheckTargets()
}
//----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
+void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
{
#ifdef CMAKE_BUILD_WITH_CMAKE
+ typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > Autogens;
+ Autogens autogens;
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{
cmTargets& targets =
@@ -1298,8 +1289,11 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
}
}
}
-#else
- (void)autogens;
+ for (Autogens::iterator it = autogens.begin(); it != autogens.end();
+ ++it)
+ {
+ it->first.SetupAutoGenerateTarget(it->second);
+ }
#endif
}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index d08ae2a..4d6e10f 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -32,7 +32,6 @@ class cmTarget;
class cmInstallTargetGenerator;
class cmInstallFilesGenerator;
class cmExportBuildFileGenerator;
-class cmQtAutoGenerators;
/** \class cmGlobalGenerator
* \brief Responable for overseeing the generation process for the entire tree
@@ -324,8 +323,7 @@ protected:
virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS();
bool CheckTargets();
- typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > AutogensType;
- void CreateQtAutoGeneratorsTargets(AutogensType& autogens);
+ void CreateQtAutoGeneratorsTargets();
// Fill the ProjectMap, this must be called after LocalGenerators
diff --git a/Tests/QtAutogen/foo.h b/Tests/QtAutogen/foo.h
index f23ec07..32d4c8d 100644
--- a/Tests/QtAutogen/foo.h
+++ b/Tests/QtAutogen/foo.h
@@ -16,10 +16,7 @@
#include <QObject>
-class Foo
-#ifdef FOO
- : public QObject
-#endif
+class Foo : public QObject
{
Q_OBJECT
public:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=020ac2426b7a02d40885e96d346832cda1dea780
commit 020ac2426b7a02d40885e96d346832cda1dea780
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 5 17:44:21 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 5 17:44:21 2013 +0100
Revert "Extract FinalizeTargetCompileDefinitions from cmGeneratorTarget."
This reverts commit c971939a60dc6d553ed3df88945bbac20ae7b574.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2ffd478..85c467d 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1095,8 +1095,6 @@ void cmGlobalGenerator::Generate()
return;
}
- this->FinalizeTargetCompileDefinitions();
-
#ifdef CMAKE_BUILD_WITH_CMAKE
// Iterate through all targets and set up automoc for those which have
// the AUTOMOC, AUTOUIC or AUTORCC property set
@@ -1306,11 +1304,13 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets(AutogensType &autogens)
}
//----------------------------------------------------------------------------
-void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
+void cmGlobalGenerator::CreateGeneratorTargets()
{
// Construct per-target generator information.
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{
+ cmGeneratorTargetsType generatorTargets;
+
cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
const std::vector<cmValueWithOrigin> noconfig_compile_definitions =
@@ -1325,6 +1325,7 @@ void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
{
cmTarget* t = &ti->second;
+ {
for (std::vector<cmValueWithOrigin>::const_iterator it
= noconfig_compile_definitions.begin();
it != noconfig_compile_definitions.end(); ++it)
@@ -1341,24 +1342,7 @@ void cmGlobalGenerator::FinalizeTargetCompileDefinitions()
mf->GetProperty(defPropName.c_str()));
}
}
- }
-}
-
-//----------------------------------------------------------------------------
-void cmGlobalGenerator::CreateGeneratorTargets()
-{
- // Construct per-target generator information.
- for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
- {
- cmGeneratorTargetsType generatorTargets;
-
- cmMakefile *mf = this->LocalGenerators[i]->GetMakefile();
- cmTargets& targets = mf->GetTargets();
- for(cmTargets::iterator ti = targets.begin();
- ti != targets.end(); ++ti)
- {
- cmTarget* t = &ti->second;
cmGeneratorTarget* gt = new cmGeneratorTarget(t);
this->GeneratorTargets[t] = gt;
generatorTargets[t] = gt;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 2e20a4d..d08ae2a 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -414,7 +414,6 @@ private:
// Per-target generator information.
cmGeneratorTargetsType GeneratorTargets;
void CreateGeneratorTargets();
- void FinalizeTargetCompileDefinitions();
void ComputeGeneratorTargetObjects();
void ClearGeneratorTargets();
virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 48 +++++++++++------------------------------
Source/cmGlobalGenerator.h | 5 +---
Tests/QtAutogen/foo.h | 5 +---
3 files changed, 15 insertions(+), 43 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list