[Cmake-commits] CMake branch, next, updated. v3.3.1-2490-g9bfcb9d
Stephen Kelly
steveire at gmail.com
Tue Aug 25 17:12:09 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 9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9 (commit)
via 7f551b4f2635816553c2ff7dacef78254875116e (commit)
via cd6293cdf8cf04fca70497a2474989b773fe922e (commit)
via de6b2895824fdac9a25fa9cd2f0f7c38b29547dc (commit)
via e35ee02d6e6aa5d1e9bc50d7c378dcbbabcf52bd (commit)
via 00f2298f0788404cf170ed6ab50b73ef890b4302 (commit)
via 6254ba95784ae29616b17ad8b42d4f31560c2c65 (commit)
via cf0a78dc4ce7debb62ceb4d12235ea75e19bebe2 (commit)
from f91dd93d9afdb02268c285214abed9d8cc50f191 (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=9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9
commit 9bfcb9d4edc48a47beff5bdeb0e476012ef3fce9
Merge: f91dd93 7f551b4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 17:12:07 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 25 17:12:07 2015 -0400
Merge topic 'minor-cleanups' into next
7f551b4f cmGlobalGenerator: Implement VS6 check without virtual method.
cd6293cd cmMakefile: Fix style.
de6b2895 cmTarget: Remove vestigal method declaration.
e35ee02d cmTarget: Fix indentation.
00f2298f Reduce uses of cmMakefile::GetGlobalGenerator.
6254ba95 cmMakefile: Remove Internal class.
cf0a78dc cmGeneratorTarget: Issue messages through the local generator.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f551b4f2635816553c2ff7dacef78254875116e
commit 7f551b4f2635816553c2ff7dacef78254875116e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 24 09:08:29 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmGlobalGenerator: Implement VS6 check without virtual method.
Don't require existence of a global generator for this check.
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index fe710f1..3403cf9 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -242,7 +242,7 @@ public:
#if defined(_WIN32) && !defined(__CYGWIN__)
/** Is this the Visual Studio 6 generator? */
- virtual bool IsForVS6() const { return false; }
+ bool IsForVS6() const { return this->GetName() == "Visual Studio 6"; }
#endif
///! Find a target by name by searching the local generators.
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index 2460158..420cb0b 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -85,8 +85,6 @@ public:
virtual void FindMakeProgram(cmMakefile*);
- virtual bool IsForVS6() const { return true; }
-
protected:
virtual void Generate();
virtual const char* GetIDEVersion() { return "6.0"; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd6293cdf8cf04fca70497a2474989b773fe922e
commit cd6293cdf8cf04fca70497a2474989b773fe922e
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 24 07:45:26 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmMakefile: Fix style.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 3289881..1550c7b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2072,7 +2072,8 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
if(std::find(this->LinkDirectories.begin(),
this->LinkDirectories.end(), newdir)
== this->LinkDirectories.end())
- {target.AddLinkDirectory(*j);
+ {
+ target.AddLinkDirectory(*j);
}
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de6b2895824fdac9a25fa9cd2f0f7c38b29547dc
commit de6b2895824fdac9a25fa9cd2f0f7c38b29547dc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 07:24:45 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmTarget: Remove vestigal method declaration.
The definition was removed in commit v3.1.0-rc1~688^2~5 (cmTarget:
Allow any generator expression in SOURCES property., 2014-03-18).
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2007b40..dccf550 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -614,8 +614,6 @@ private:
void MaybeInvalidatePropertyCache(const std::string& prop);
- void ProcessSourceExpression(std::string const& expr);
-
// Internal representation details.
friend class cmTargetInternals;
friend class cmGeneratorTarget;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e35ee02d6e6aa5d1e9bc50d7c378dcbbabcf52bd
commit e35ee02d6e6aa5d1e9bc50d7c378dcbbabcf52bd
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 08:07:04 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:06:33 2015 +0200
cmTarget: Fix indentation.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 49b3239..747f465 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1842,12 +1842,12 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
}
- this->Internal->SourceFilesMap.clear();
- cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
- cmGeneratorExpression ge(lfbt);
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
- this->Internal->SourceEntries.push_back(
- new cmTargetInternals::TargetPropertyEntry(cge));
+ this->Internal->SourceFilesMap.clear();
+ cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+ cmGeneratorExpression ge(lfbt);
+ cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
+ this->Internal->SourceEntries.push_back(
+ new cmTargetInternals::TargetPropertyEntry(cge));
}
else
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00f2298f0788404cf170ed6ab50b73ef890b4302
commit 00f2298f0788404cf170ed6ab50b73ef890b4302
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 22:55:11 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 23:06:33 2015 +0200
Reduce uses of cmMakefile::GetGlobalGenerator.
Don't assume the cmMakefile has a global generator.
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 59590fd..1e02ae4 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -12,6 +12,7 @@
#include "cmComputeLinkDepends.h"
#include "cmComputeComponentGraph.h"
+#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
#include "cmMakefile.h"
#include "cmTarget.h"
@@ -177,7 +178,8 @@ cmComputeLinkDepends
// Store context information.
this->Target = target;
this->Makefile = this->Target->Target->GetMakefile();
- this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
+ this->GlobalGenerator =
+ this->Target->GetLocalGenerator()->GetGlobalGenerator();
this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance();
// The configuration being linked.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 6ba0eed..6c3822f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -769,7 +769,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
std::string lib;
if(tgt)
{
- gtgt = tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+ gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
this->AddLibraryRuntimeInfo(lib, tgt);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ffdb54f..25fc8a7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1228,7 +1228,7 @@ public:
: Preference(0), Target(target)
{
this->Makefile = this->Target->Makefile;
- this->GG = this->Makefile->GetGlobalGenerator();
+ this->GG = this->Target->GetLocalGenerator()->GetGlobalGenerator();
}
void Consider(const char* lang)
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6254ba95784ae29616b17ad8b42d4f31560c2c65
commit 6254ba95784ae29616b17ad8b42d4f31560c2c65
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 22:19:57 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 22:19:57 2015 +0200
cmMakefile: Remove Internal class.
Move only remaining state to the direct class.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2296d5a..3289881 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -43,19 +43,12 @@
#include <ctype.h> // for isspace
#include <assert.h>
-class cmMakefile::Internals
-{
-public:
- bool IsSourceFileTryCompile;
-};
-
// default is not to be building executables
cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
- : Internal(new Internals),
- LocalGenerator(localGenerator),
+ : LocalGenerator(localGenerator),
StateSnapshot(localGenerator->GetStateSnapshot())
{
- this->Internal->IsSourceFileTryCompile = false;
+ this->IsSourceFileTryCompile = false;
// Initialize these first since AddDefaultDefinitions calls AddDefinition
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
@@ -3616,7 +3609,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
const std::vector<std::string> *cmakeArgs,
std::string& output)
{
- this->Internal->IsSourceFileTryCompile = fast;
+ this->IsSourceFileTryCompile = fast;
// does the binary directory exist ? If not create it...
if (!cmSystemTools::FileIsDirectory(bindir))
{
@@ -3641,7 +3634,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
"Internal CMake error, TryCompile bad GlobalGenerator");
// return to the original directory
cmSystemTools::ChangeDirectory(cwd);
- this->Internal->IsSourceFileTryCompile = false;
+ this->IsSourceFileTryCompile = false;
return 1;
}
cm.SetGlobalGenerator(gg);
@@ -3712,7 +3705,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
"Internal CMake error, TryCompile configure of cmake failed");
// return to the original directory
cmSystemTools::ChangeDirectory(cwd);
- this->Internal->IsSourceFileTryCompile = false;
+ this->IsSourceFileTryCompile = false;
return 1;
}
@@ -3722,7 +3715,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
"Internal CMake error, TryCompile generation of cmake failed");
// return to the original directory
cmSystemTools::ChangeDirectory(cwd);
- this->Internal->IsSourceFileTryCompile = false;
+ this->IsSourceFileTryCompile = false;
return 1;
}
@@ -3735,13 +3728,13 @@ int cmMakefile::TryCompile(const std::string& srcdir,
this);
cmSystemTools::ChangeDirectory(cwd);
- this->Internal->IsSourceFileTryCompile = false;
+ this->IsSourceFileTryCompile = false;
return ret;
}
bool cmMakefile::GetIsSourceFileTryCompile() const
{
- return this->Internal->IsSourceFileTryCompile;
+ return this->IsSourceFileTryCompile;
}
cmake *cmMakefile::GetCMakeInstance() const
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 055170a..1f8a054 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -62,8 +62,6 @@ class cmGeneratorExpressionEvaluationFile;
*/
class cmMakefile
{
- class Internals;
- cmsys::auto_ptr<Internals> Internal;
public:
/* Mark a variable as used */
void MarkVariableAsUsed(const std::string& var);
@@ -996,6 +994,7 @@ private:
bool CheckSystemVars;
bool CheckCMP0000;
bool Configured;
+ bool IsSourceFileTryCompile;
mutable bool SuppressWatches;
};
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf0a78dc4ce7debb62ceb4d12235ea75e19bebe2
commit cf0a78dc4ce7debb62ceb4d12235ea75e19bebe2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Aug 25 22:18:39 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Aug 25 22:18:39 2015 +0200
cmGeneratorTarget: Issue messages through the local generator.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dd58e7b..ffdb54f 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1403,7 +1403,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
msg += this->GetName();
msg += " which has type ";
msg += cmTarget::GetTargetTypeName(this->Target->GetType());
- this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, msg);
+ this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
return 0;
}
@@ -2093,7 +2093,7 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const
{
std::string msg = "NormalGetRealName called on imported target: ";
msg += this->GetName();
- this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, msg);
+ this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
}
if(this->GetType() == cmTarget::EXECUTABLE)
-----------------------------------------------------------------------
Summary of changes:
Source/cmComputeLinkDepends.cxx | 4 +++-
Source/cmComputeLinkInformation.cxx | 2 +-
Source/cmGeneratorTarget.cxx | 6 +++---
Source/cmGlobalGenerator.h | 2 +-
Source/cmGlobalVisualStudio6Generator.h | 2 --
Source/cmMakefile.cxx | 26 ++++++++++----------------
Source/cmMakefile.h | 3 +--
Source/cmTarget.cxx | 12 ++++++------
Source/cmTarget.h | 2 --
9 files changed, 25 insertions(+), 34 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list