kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VisualStudio: Replace Compute override with AddExtraIDETargets override.

Browse Source
This commit is contained in:
Stephen Kelly 2015-09-15 20:47:35 +02:00
parent a9588e90bb
commit 21f428f4c0
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -348,13 +348,9 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudio8Generator::Compute() void cmGlobalVisualStudio8Generator::AddExtraIDETargets()
{ {
if (!cmGlobalVisualStudio7Generator::Compute()) cmGlobalVisualStudio7Generator::AddExtraIDETargets();
{
return false;
}
if(this->AddCheckTarget()) if(this->AddCheckTarget())
{ {
// All targets depend on the build-system check target. // All targets depend on the build-system check target.
@ -368,7 +364,6 @@ bool cmGlobalVisualStudio8Generator::Compute()
} }
} }
} }
return true;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmGlobalVisualStudio8Generator.h
View File

@ -67,7 +67,7 @@ public:
return !this->WindowsCEVersion.empty(); } return !this->WindowsCEVersion.empty(); }
protected: protected:
virtual bool Compute(); virtual void AddExtraIDETargets();
virtual const char* GetIDEVersion() { return "8.0"; } virtual const char* GetIDEVersion() { return "8.0"; }
virtual std::string FindDevEnvCommand(); virtual std::string FindDevEnvCommand();

8
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -64,13 +64,8 @@ std::string cmGlobalVisualStudioGenerator::GetRegistryBase(
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudioGenerator::Compute() void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
{ {
if (!cmGlobalGenerator::Compute())
{
return false;
}
// Add a special target that depends on ALL projects for easy build // Add a special target that depends on ALL projects for easy build
// of one configuration only. // of one configuration only.
const char* no_working_dir = 0; const char* no_working_dir = 0;
@ -144,7 +139,6 @@ bool cmGlobalVisualStudioGenerator::Compute()
static_cast<cmLocalVisualStudioGenerator*>(*lgi); static_cast<cmLocalVisualStudioGenerator*>(*lgi);
lg->AddCMakeListsRules(); lg->AddCMakeListsRules();
} }
return true;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmGlobalVisualStudioGenerator.h
View File

@ -111,7 +111,7 @@ public:
cmGeneratorTarget*, std::vector<cmCustomCommand>& commands, cmGeneratorTarget*, std::vector<cmCustomCommand>& commands,
std::string const& configName); std::string const& configName);
protected: protected:
virtual bool Compute(); virtual void AddExtraIDETargets();
// Does this VS version link targets to each other if there are // Does this VS version link targets to each other if there are
// dependencies in the SLN file? This was done for VS versions // dependencies in the SLN file? This was done for VS versions