summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-02-26 13:57:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-02-26 13:57:25 (GMT)
commit1f7ad8ab5c053a0c9680984eed507e0bfe68f5db (patch)
tree074f0be65beb86ac7ab07a2742c1a6ad00f1828b /Source/cmVisualStudio10TargetGenerator.cxx
parent8621a26c06f6d691b2d98fabf19f0195304ba0d1 (diff)
parent076a356cd1972a149898fdba77d1dd83981447b4 (diff)
downloadCMake-1f7ad8ab5c053a0c9680984eed507e0bfe68f5db.zip
CMake-1f7ad8ab5c053a0c9680984eed507e0bfe68f5db.tar.gz
CMake-1f7ad8ab5c053a0c9680984eed507e0bfe68f5db.tar.bz2
Merge topic 'project-references-csharp-17678'
076a356c VS: Support C# project references Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1752
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f38bf73..c7b60b9 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3433,6 +3433,17 @@ void cmVisualStudio10TargetGenerator::AddLibraries(
std::string currentBinDir =
this->LocalGenerator->GetCurrentBinaryDirectory();
for (cmComputeLinkInformation::Item const& l : libs) {
+ // Do not allow C# targets to be added to the LIB listing. LIB files are
+ // used for linking C++ dependencies. C# libraries do not have lib files.
+ // Instead, they compile down to C# reference libraries (DLL files). The
+ // `<ProjectReference>` elements added to the vcxproj are enough for the
+ // IDE to deduce the DLL file required by other C# projects that need its
+ // reference library.
+ if (l.Target &&
+ cmGlobalVisualStudioGenerator::TargetIsCSharpOnly(l.Target)) {
+ continue;
+ }
+
if (l.IsPath) {
std::string path =
this->LocalGenerator->ConvertToRelativePath(currentBinDir, l.Value);