[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-572-g2fc23bc
Stephen Kelly
steveire at gmail.com
Sun Jun 21 15:14:23 EDT 2015
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 2fc23bc53942df11b9107772eebd9f9a4b2c62a9 (commit)
via 820986edfff97779bb0c84fd9da3b284921c8ae4 (commit)
via b3e2e332eb9c2a7d73ec872664cee896248c6c38 (commit)
via 61c0113c13fe4a65c394e56cc0354db0b80d9c4c (commit)
via 080489b8a92253bedbb67cc7958351350f4b2341 (commit)
via 8bfaadfa394c9b462259ea13df6b2df7c4544ab4 (commit)
from 1fa54edcbf30fed8df32f30e0cc4466af6775436 (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=2fc23bc53942df11b9107772eebd9f9a4b2c62a9
commit 2fc23bc53942df11b9107772eebd9f9a4b2c62a9
Merge: 1fa54ed 820986e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 21 15:14:22 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 21 15:14:22 2015 -0400
Merge topic 'minor-cleanups' into next
820986ed cmLocalGenerator: Constify GetIncludeDirectories method.
b3e2e332 QtAutogen: Get the global generator from the Makefile.
61c0113c cmLocalUnixMakefileGenerator3: Remove unused method.
080489b8 cmMakefile: Use member directly instead of through method.
8bfaadfa cmMakefile: Move IsRoot API from cmLocalGenerator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=820986edfff97779bb0c84fd9da3b284921c8ae4
commit 820986edfff97779bb0c84fd9da3b284921c8ae4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 12:57:19 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 21:14:09 2015 +0200
cmLocalGenerator: Constify GetIncludeDirectories method.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 119cba9..6f98ee2 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1341,7 +1341,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
const std::string& lang,
const std::string& config,
bool stripImplicitInclDirs
- )
+ ) const
{
// Need to decide whether to automatically include the source and
// binary directories at the beginning of the include path.
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index a3f9588..98f4d3a 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -183,7 +183,7 @@ public:
cmGeneratorTarget* target,
const std::string& lang = "C",
const std::string& config = "",
- bool stripImplicitInclDirs = true);
+ bool stripImplicitInclDirs = true) const;
void AddCompileOptions(std::string& flags, cmTarget* target,
const std::string& lang, const std::string& config);
void AddCompileDefinitions(std::set<std::string>& defines,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3e2e332eb9c2a7d73ec872664cee896248c6c38
commit b3e2e332eb9c2a7d73ec872664cee896248c6c38
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 14:59:22 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 21:14:08 2015 +0200
QtAutogen: Get the global generator from the Makefile.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index f472ed8..53fea83 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -368,8 +368,7 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target)
#if defined(_WIN32) && !defined(__CYGWIN__)
bool usePRE_BUILD = false;
- cmLocalGenerator* localGen = makefile->GetLocalGenerator();
- cmGlobalGenerator* gg = localGen->GetGlobalGenerator();
+ cmGlobalGenerator* gg = makefile->GetGlobalGenerator();
if(gg->GetName().find("Visual Studio") != std::string::npos)
{
cmGlobalVisualStudioGenerator* vsgg =
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61c0113c13fe4a65c394e56cc0354db0b80d9c4c
commit 61c0113c13fe4a65c394e56cc0354db0b80d9c4c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 13:06:47 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 21:14:07 2015 +0200
cmLocalUnixMakefileGenerator3: Remove unused method.
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 4e4d146..b097c95 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -149,9 +149,6 @@ public:
void AddImplicitDepends(cmTarget const& tgt, const std::string& lang,
const char* obj, const char* src);
- void AppendGlobalTargetDepends(std::vector<std::string>& depends,
- cmTarget& target);
-
// write the target rules for the local Makefile into the stream
void WriteLocalAllRules(std::ostream& ruleFileStream);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=080489b8a92253bedbb67cc7958351350f4b2341
commit 080489b8a92253bedbb67cc7958351350f4b2341
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 14:39:27 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 21:14:06 2015 +0200
cmMakefile: Use member directly instead of through method.
This function will not be around much longer anyway.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cf7897e..64d8638 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -105,7 +105,7 @@ public:
++it;
if(it == this->VarStack.rend())
{
- cmLocalGenerator* plg = mf->GetLocalGenerator()->GetParent();
+ cmLocalGenerator* plg = mf->LocalGenerator->GetParent();
if(!plg)
{
return false;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bfaadfa394c9b462259ea13df6b2df7c4544ab4
commit 8bfaadfa394c9b462259ea13df6b2df7c4544ab4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 14:07:15 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 21 21:14:05 2015 +0200
cmMakefile: Move IsRoot API from cmLocalGenerator.
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4fe52dd..0f61225 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -529,7 +529,7 @@ cmGlobalUnixMakefileGenerator3
cmLocalUnixMakefileGenerator3* lg)
{
// Only subdirectories need these rules.
- if(lg->IsRootMakefile())
+ if(lg->GetMakefile()->IsRootMakefile())
{
return;
}
@@ -1034,7 +1034,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]);
// for the passed in makefile or if this is the top Makefile wripte out
// the targets
- if (lg2 == lg || lg->IsRootMakefile())
+ if (lg2 == lg || lg->GetMakefile()->IsRootMakefile())
{
// for each target Generate the rule files for each target.
cmTargets& targets = lg2->GetMakefile()->GetTargets();
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index a42d5a7..119cba9 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -68,11 +68,6 @@ cmLocalGenerator::~cmLocalGenerator()
delete this->Makefile;
}
-bool cmLocalGenerator::IsRootMakefile() const
-{
- return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
-}
-
void cmLocalGenerator::IssueMessage(cmake::MessageType t,
std::string const& text) const
{
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 4452eef..a3f9588 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -40,9 +40,6 @@ public:
cmState::Snapshot snapshot);
virtual ~cmLocalGenerator();
- /// @return whether we are processing the top CMakeLists.txt file.
- bool IsRootMakefile() const;
-
/**
* Generate the makefile for this directory.
*/
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index 427ae10..4db36fc 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -58,7 +58,7 @@ void cmLocalNinjaGenerator::Generate()
#endif
// We do that only once for the top CMakeLists.txt file.
- if(this->IsRootMakefile())
+ if(this->Makefile->IsRootMakefile())
{
this->WriteBuildFileTop();
@@ -298,7 +298,7 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os)
<< "# Write statements declared in CMakeLists.txt:" << std::endl
<< "# "
<< this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE") << std::endl;
- if(this->IsRootMakefile())
+ if(this->Makefile->IsRootMakefile())
os << "# Which is the root file." << std::endl;
cmGlobalNinjaGenerator::WriteDivider(os);
os << std::endl;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0338062..cf7897e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1608,6 +1608,11 @@ void cmMakefile::PopMacroScope(bool reportError)
this->PopFunctionBlockerBarrier(reportError);
}
+bool cmMakefile::IsRootMakefile() const
+{
+ return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
+}
+
//----------------------------------------------------------------------------
class cmMakefileCurrent
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 86bde0c..44bd8c6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -90,6 +90,9 @@ public:
*/
void AddFunctionBlocker(cmFunctionBlocker* fb);
+ /// @return whether we are processing the top CMakeLists.txt file.
+ bool IsRootMakefile() const;
+
/**
* Remove the function blocker whose scope ends with the given command.
* This returns ownership of the function blocker object.
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx
index 90bc111..46d7e01 100644
--- a/Source/cmProjectCommand.cxx
+++ b/Source/cmProjectCommand.cxx
@@ -53,7 +53,7 @@ bool cmProjectCommand
// CMAKE_PROJECT_NAME will match PROJECT_NAME, and cmake --build
// will work.
if(!this->Makefile->GetDefinition("CMAKE_PROJECT_NAME")
- || (this->Makefile->GetLocalGenerator()->IsRootMakefile()))
+ || (this->Makefile->IsRootMakefile()))
{
this->Makefile->AddDefinition("CMAKE_PROJECT_NAME", args[0].c_str());
this->Makefile->AddCacheDefinition
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalUnixMakefileGenerator3.cxx | 4 ++--
Source/cmLocalGenerator.cxx | 7 +------
Source/cmLocalGenerator.h | 5 +----
Source/cmLocalNinjaGenerator.cxx | 4 ++--
Source/cmLocalUnixMakefileGenerator3.h | 3 ---
Source/cmMakefile.cxx | 7 ++++++-
Source/cmMakefile.h | 3 +++
Source/cmProjectCommand.cxx | 2 +-
Source/cmQtAutoGenerators.cxx | 3 +--
9 files changed, 17 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list