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

VS: Fix CMAKE_SUPPRESS_REGENERATION bad ZERO_CHECK dependency (#14378) 

When CMAKE_SUPPRESS_REGENERATION tells us not to create the ZERO_CHECK
target we should not add dependencies on it from other targets either.

Reviewed-by: Mateusz Loskot <mateusz@loskot.net>
This commit is contained in:
Brad King 2013-08-27 14:15:49 -04:00
parent b15ad0d1de
commit e478f03469
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -202,7 +202,7 @@ std::string cmGlobalVisualStudio8Generator::GetUserMacrosRegKeyBase()
}
//----------------------------------------------------------------------------
void cmGlobalVisualStudio8Generator::AddCheckTarget()
bool cmGlobalVisualStudio8Generator::AddCheckTarget()
{
// Add a special target on which all other targets depend that
// checks the build system and optionally re-runs CMake.
@ -216,7 +216,7 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
// Skip the target if no regeneration is to be done.
if(mf->IsOn("CMAKE_SUPPRESS_REGENERATION"))
{
return;
return false;
}
std::string cmake_command = mf->GetRequiredDefinition("CMAKE_COMMAND");
@ -315,21 +315,24 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
cmSystemTools::Error("Error adding rule for ", stamps[0].c_str());
}
}
return true;
}
//----------------------------------------------------------------------------
void cmGlobalVisualStudio8Generator::Generate()
{
this->AddCheckTarget();
// All targets depend on the build-system check target.
for(std::map<cmStdString,cmTarget *>::const_iterator
ti = this->TotalTargets.begin();
ti != this->TotalTargets.end(); ++ti)
if(this->AddCheckTarget())
{
if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
// All targets depend on the build-system check target.
for(std::map<cmStdString,cmTarget *>::const_iterator
ti = this->TotalTargets.begin();
ti != this->TotalTargets.end(); ++ti)
{
ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
if(ti->first != CMAKE_CHECK_BUILD_SYSTEM_TARGET)
{
ti->second->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
}
}
}

2
Source/cmGlobalVisualStudio8Generator.h
View File

@ -71,7 +71,7 @@ protected:
virtual bool VSLinksDependencies() const { return false; }
void AddCheckTarget();
bool AddCheckTarget();
static cmIDEFlagTable const* GetExtraFlagTableVS8();
virtual void WriteSLNHeader(std::ostream& fout);