Merge topic 'vs-alternate-RootNamespace'
8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case
This commit is contained in:
commit
850764fc70
@ -531,7 +531,9 @@ void cmVisualStudio10TargetGenerator::WriteEmbeddedResourceGroup()
|
|||||||
this->Configurations.begin();
|
this->Configurations.begin();
|
||||||
i != this->Configurations.end(); ++i) {
|
i != this->Configurations.end(); ++i) {
|
||||||
this->WritePlatformConfigTag("LogicalName", i->c_str(), 3);
|
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) << "$(RootNamespace).";
|
||||||
}
|
}
|
||||||
(*this->BuildFileStream) << "%(Filename)";
|
(*this->BuildFileStream) << "%(Filename)";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user