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

VS7: Port remaining interface to cmGeneratorTarget

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-24 15:42:04 +02:00
parent 780bff5279
commit 7b127c62d4
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -401,7 +401,7 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
for(OrderedTargetDependSet::const_iterator tt = for(OrderedTargetDependSet::const_iterator tt =
projectTargets.begin(); tt != projectTargets.end(); ++tt) projectTargets.begin(); tt != projectTargets.end(); ++tt)
{ {
cmTarget const* target = (*tt)->Target; cmGeneratorTarget const* target = *tt;
if(target->GetType() == cmState::INTERFACE_LIBRARY) if(target->GetType() == cmState::INTERFACE_LIBRARY)
{ {
continue; continue;
@ -996,7 +996,8 @@ cmGlobalVisualStudio7Generator
std::set<std::string> std::set<std::string>
cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild( cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
std::vector<std::string> const& configs, std::vector<std::string> const& configs,
OrderedTargetDependSet const& projectTargets, cmTarget const* target) OrderedTargetDependSet const& projectTargets,
cmGeneratorTarget const* target)
{ {
std::set<std::string> activeConfigs; std::set<std::string> activeConfigs;
// if it is a utilitiy target then only make it part of the // if it is a utilitiy target then only make it part of the
@ -1011,13 +1012,13 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
for(std::vector<std::string>::const_iterator i = configs.begin(); for(std::vector<std::string>::const_iterator i = configs.begin();
i != configs.end(); ++i) i != configs.end(); ++i)
{ {
const char* propertyValue = target->GetMakefile() const char* propertyValue = target->Target->GetMakefile()
->GetDefinition("CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD"); ->GetDefinition("CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD");
cmGeneratorExpression ge; cmGeneratorExpression ge;
cmsys::auto_ptr<cmCompiledGeneratorExpression> cmsys::auto_ptr<cmCompiledGeneratorExpression>
cge = ge.Parse(propertyValue); cge = ge.Parse(propertyValue);
cmGeneratorTarget* gt = this->GetGeneratorTarget(target); if(cmSystemTools::IsOn(cge->Evaluate(target->GetLocalGenerator(),
if(cmSystemTools::IsOn(cge->Evaluate(gt->GetLocalGenerator(), *i))) *i)))
{ {
activeConfigs.insert(*i); activeConfigs.insert(*i);
} }
@ -1029,13 +1030,12 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
{ {
return activeConfigs; return activeConfigs;
} }
cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
// inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties // inspect EXCLUDE_FROM_DEFAULT_BUILD[_<CONFIG>] properties
for(std::vector<std::string>::const_iterator i = configs.begin(); for(std::vector<std::string>::const_iterator i = configs.begin();
i != configs.end(); ++i) i != configs.end(); ++i)
{ {
const char* propertyValue = const char* propertyValue =
gt->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str()); target->GetFeature("EXCLUDE_FROM_DEFAULT_BUILD", i->c_str());
if(cmSystemTools::IsOff(propertyValue)) if(cmSystemTools::IsOff(propertyValue))
{ {
activeConfigs.insert(*i); activeConfigs.insert(*i);
@ -1047,9 +1047,8 @@ cmGlobalVisualStudio7Generator::IsPartOfDefaultBuild(
bool bool
cmGlobalVisualStudio7Generator cmGlobalVisualStudio7Generator
::IsDependedOn(OrderedTargetDependSet const& projectTargets, ::IsDependedOn(OrderedTargetDependSet const& projectTargets,
cmTarget const* targetIn) cmGeneratorTarget const* gtIn)
{ {
cmGeneratorTarget* gtIn = this->GetGeneratorTarget(targetIn);
for (OrderedTargetDependSet::const_iterator l = projectTargets.begin(); for (OrderedTargetDependSet::const_iterator l = projectTargets.begin();
l != projectTargets.end(); ++l) l != projectTargets.end(); ++l)
{ {

4
Source/cmGlobalVisualStudio7Generator.h
View File

@ -163,9 +163,9 @@ protected:
std::set<std::string> std::set<std::string>
IsPartOfDefaultBuild(std::vector<std::string> const& configs, IsPartOfDefaultBuild(std::vector<std::string> const& configs,
OrderedTargetDependSet const& projectTargets, OrderedTargetDependSet const& projectTargets,
cmTarget const* target); cmGeneratorTarget const* target);
bool IsDependedOn(OrderedTargetDependSet const& projectTargets, bool IsDependedOn(OrderedTargetDependSet const& projectTargets,
cmTarget const* target); cmGeneratorTarget const* target);
std::map<std::string, std::string> GUIDMap; std::map<std::string, std::string> GUIDMap;
virtual void WriteFolders(std::ostream& fout); virtual void WriteFolders(std::ostream& fout);