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

Merge topic 'simplify-multi-config'

Browse Source 
936e00b9 Simplify multiple config handling.
This commit is contained in:
Brad King 2014-04-03 12:51:42 -04:00 committed by CMake Topic Stage
commit 3e87d7cbd0
3 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmExportCommand.cxx
View File

@ -223,18 +223,15 @@ bool cmExportCommand
// Compute the set of configurations exported. // Compute the set of configurations exported.
std::vector<std::string> configurationTypes; std::vector<std::string> configurationTypes;
this->Makefile->GetConfigurations(configurationTypes); this->Makefile->GetConfigurations(configurationTypes);
if(!configurationTypes.empty()) if(configurationTypes.empty())
{ {
for(std::vector<std::string>::const_iterator configurationTypes.push_back("");
ci = configurationTypes.begin();
ci != configurationTypes.end(); ++ci)
{
ebfg->AddConfiguration(*ci);
}
} }
else for(std::vector<std::string>::const_iterator
ci = configurationTypes.begin();
ci != configurationTypes.end(); ++ci)
{ {
ebfg->AddConfiguration(""); ebfg->AddConfiguration(*ci);
} }
if (this->ExportSet) if (this->ExportSet)
{ {

15
Source/cmGeneratorExpressionEvaluationFile.cxx
View File

@ -135,18 +135,15 @@ void cmGeneratorExpressionEvaluationFile::Generate()
if (allConfigs.empty()) if (allConfigs.empty())
{ {
this->Generate("", inputExpression.get(), outputFiles); allConfigs.push_back("");
} }
else for(std::vector<std::string>::const_iterator li = allConfigs.begin();
li != allConfigs.end(); ++li)
{ {
for(std::vector<std::string>::const_iterator li = allConfigs.begin(); this->Generate(*li, inputExpression.get(), outputFiles);
li != allConfigs.end(); ++li) if(cmSystemTools::GetFatalErrorOccured())
{ {
this->Generate(*li, inputExpression.get(), outputFiles); return;
if(cmSystemTools::GetFatalErrorOccured())
{
return;
}
} }
} }
} }

19
Source/cmLocalGenerator.cxx
View File

@ -542,6 +542,10 @@ void cmLocalGenerator::GenerateTargetManifest()
// Collect the set of configuration types. // Collect the set of configuration types.
std::vector<std::string> configNames; std::vector<std::string> configNames;
this->Makefile->GetConfigurations(configNames); this->Makefile->GetConfigurations(configNames);
if(configNames.empty())
{
configNames.push_back("");
}
// Add our targets to the manifest for each configuration. // Add our targets to the manifest for each configuration.
cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets(); cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets();
@ -557,18 +561,11 @@ void cmLocalGenerator::GenerateTargetManifest()
{ {
continue; continue;
} }
if(configNames.empty()) for(std::vector<std::string>::iterator ci = configNames.begin();
ci != configNames.end(); ++ci)
{ {
target.GenerateTargetManifest(""); const char* config = ci->c_str();
} target.GenerateTargetManifest(config);
else
{
for(std::vector<std::string>::iterator ci = configNames.begin();
ci != configNames.end(); ++ci)
{
const char* config = ci->c_str();
target.GenerateTargetManifest(config);
}
} }
} }
} }