Merge topic 'minor-cleanups'

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.
This commit is contained in:
Brad King 2015-08-27 10:04:12 -04:00 committed by CMake Topic Stage
commit 445077cbd2
9 changed files with 25 additions and 34 deletions

View File

@ -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.

View File

@ -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);

View File

@ -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)
{
@ -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)

View File

@ -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.

View File

@ -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"; }

View File

@ -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();
@ -2083,7 +2076,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);
}
}
}
@ -3620,7 +3614,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))
{
@ -3645,7 +3639,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);
@ -3716,7 +3710,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;
}
@ -3726,7 +3720,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;
}
@ -3739,13 +3733,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

View File

@ -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);
@ -991,6 +989,7 @@ private:
bool CheckSystemVars;
bool CheckCMP0000;
bool Configured;
bool IsSourceFileTryCompile;
mutable bool SuppressWatches;
};

View File

@ -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;