Merge topic 'vs-alternate-RootNamespace'

8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case
This commit is contained in:
Brad King 2016-07-21 10:39:10 -04:00 committed by CMake Topic Stage
commit 850764fc70
1 changed files with 3 additions and 1 deletions

View File

@ -531,7 +531,9 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
this->Configurations.begin();
i != this->Configurations.end(); ++i) {
this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
if (this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE")) {
if (this->GeneratorTarget->GetProperty("VS_GLOBAL_ROOTNAMESPACE") ||
// Handle variant of VS_GLOBAL_<variable> for RootNamespace.
this->GeneratorTarget->GetProperty("VS_GLOBAL_RootNamespace")) {
(*this->BuildFileStream) << "$(RootNamespace).";
}
(*this->BuildFileStream) << "%(Filename)";