diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-21 14:39:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-21 14:39:10 (GMT) |
| commit | 850764fc701ce9e1190d5bb20af97ec511763f0b (patch) | |
| tree | 49d9b4683ef240a39de93f18f81580543efb9b02 | |
| parent | e297e0455eb50243197bfe2f4f0594971ba9aab0 (diff) | |
| parent | 8aa97fba9eb5d54d7141895c1db1ed8afe820d75 (diff) | |
| download | CMake-850764fc701ce9e1190d5bb20af97ec511763f0b.zip CMake-850764fc701ce9e1190d5bb20af97ec511763f0b.tar.gz CMake-850764fc701ce9e1190d5bb20af97ec511763f0b.tar.bz2 | |
Merge topic 'vs-alternate-RootNamespace'
8aa97fba VS: Handle VS_GLOBAL_RootNamespace special case
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 29459db..7624f78 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -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)"; |