diff options
| author | Benjamin Ballet <bballet@ivsweb.com> | 2016-07-20 15:10:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-07-20 15:34:47 (GMT) |
| commit | 8aa97fba9eb5d54d7141895c1db1ed8afe820d75 (patch) | |
| tree | dc24253e4d31ce6c28b7d4960eaa6f3a226409df | |
| parent | df14a98e9c4af316cd5e75d6af8cc7b75da2db8f (diff) | |
| download | CMake-8aa97fba9eb5d54d7141895c1db1ed8afe820d75.zip CMake-8aa97fba9eb5d54d7141895c1db1ed8afe820d75.tar.gz CMake-8aa97fba9eb5d54d7141895c1db1ed8afe820d75.tar.bz2 | |
VS: Handle VS_GLOBAL_RootNamespace special case
Although we provide a `VS_GLOBAL_ROOTNAMESPACE` option to both set
the `RootNamespace` value and reference it, some users may try to
set `VS_GLOBAL_RootNamespace` to set `RootNamespace` as a variant
of the `VS_GLOBAL_<variable>` property. In this case we still
need to add the reference to `$(RootNamespace)`.
| -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)"; |