diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-17 11:32:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-17 11:32:11 (GMT) |
| commit | d41e767f2ba538a8c09a9f8b1168c3398ab62113 (patch) | |
| tree | 2b8cc051d3b93d1bef2a74ceb642e79183ba01de | |
| parent | dcec17a31a725c8760ebaeb2b40c3bbecce32d94 (diff) | |
| parent | c8e98974d8a71ff048eea60e2949382d39d51383 (diff) | |
| download | CMake-d41e767f2ba538a8c09a9f8b1168c3398ab62113.zip CMake-d41e767f2ba538a8c09a9f8b1168c3398ab62113.tar.gz CMake-d41e767f2ba538a8c09a9f8b1168c3398ab62113.tar.bz2 | |
Merge topic 'vs-conditional-reference-assembly'
c8e98974d8 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1956
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index cabe89f..19cb50b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3667,10 +3667,8 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences() "{" + this->GlobalGenerator->GetGUID(name) + "}", 3); this->WriteElem("Name", name, 3); this->WriteDotNetReferenceCustomTags(name); - if (csproj == this->ProjectType) { - if (!this->GlobalGenerator->TargetCanBeReferenced(dt)) { - this->WriteElem("ReferenceOutputAssembly", "false", 3); - } + if (!this->GlobalGenerator->TargetCanBeReferenced(dt)) { + this->WriteElem("ReferenceOutputAssembly", "false", 3); } this->WriteString("</ProjectReference>\n", 2); } |