mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 21:31:08 -06:00
VS: Do not reference output assemblies if not possible for CSharp target
Since commit v3.9.0-rc4~4^2 (Vs: allow CSharp targets to be linked to CXX targets, 2017-06-20) CSharp targets get `ProjectReference` entries to their dependencies. This causes VS to also reference the dependency's output assembly by default, which is incorrect for non-managed targets. Fix this by setting `ReferenceOutputAssembly` to `false` for targets that can't provide output assemblies. Unmanaged C++ targets (shared libs & executables) can still be referenced and a warning will be shown in the IDE but the build will not break anymore. Fixes: #17172
This commit is contained in:
committed by
Brad King
parent
2990799227
commit
7e57e6ae12
@@ -778,6 +778,19 @@ bool cmGlobalVisualStudioGenerator::TargetIsCSharpOnly(
|
||||
return false;
|
||||
}
|
||||
|
||||
bool cmGlobalVisualStudioGenerator::TargetCanBeReferenced(
|
||||
cmGeneratorTarget const* gt)
|
||||
{
|
||||
if (this->TargetIsCSharpOnly(gt)) {
|
||||
return true;
|
||||
}
|
||||
if (gt->GetType() != cmStateEnums::SHARED_LIBRARY &&
|
||||
gt->GetType() != cmStateEnums::EXECUTABLE) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool cmGlobalVisualStudioGenerator::TargetCompare::operator()(
|
||||
cmGeneratorTarget const* l, cmGeneratorTarget const* r) const
|
||||
{
|
||||
|
||||
@@ -85,6 +85,9 @@ public:
|
||||
// return true if target is C# only
|
||||
static bool TargetIsCSharpOnly(cmGeneratorTarget const* gt);
|
||||
|
||||
// return true if target can be referenced by C# targets
|
||||
bool TargetCanBeReferenced(cmGeneratorTarget const* gt);
|
||||
|
||||
/** Get the top-level registry key for this VS version. */
|
||||
std::string GetRegistryBase();
|
||||
|
||||
|
||||
@@ -3502,6 +3502,13 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
|
||||
(*this->BuildFileStream) << "</Project>\n";
|
||||
this->WriteString("<Name>", 3);
|
||||
(*this->BuildFileStream) << name << "</Name>\n";
|
||||
if (csproj == this->ProjectType) {
|
||||
if (!static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
|
||||
->TargetCanBeReferenced(dt)) {
|
||||
this->WriteString(
|
||||
"<ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n", 3);
|
||||
}
|
||||
}
|
||||
this->WriteString("</ProjectReference>\n", 2);
|
||||
}
|
||||
this->WriteString("</ItemGroup>\n", 1);
|
||||
|
||||
@@ -15,3 +15,9 @@ target_compile_options(CLIApp PRIVATE "/clr")
|
||||
add_executable(CSharpLinkToCxx csharp.cs)
|
||||
|
||||
target_link_libraries(CSharpLinkToCxx CLIApp)
|
||||
|
||||
# this unmanaged C++ library will be added to the C#/.NET
|
||||
# references of CSharpLinkToCxx but it will show a warning
|
||||
# because it is unmanaged
|
||||
add_library(CppNativeApp SHARED cpp_native.hpp cpp_native.cpp)
|
||||
target_link_libraries(CSharpLinkToCxx CppNativeApp)
|
||||
|
||||
10
Tests/CSharpLinkToCxx/cpp_native.cpp
Normal file
10
Tests/CSharpLinkToCxx/cpp_native.cpp
Normal file
@@ -0,0 +1,10 @@
|
||||
#include "cpp_native.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
namespace CppApp {
|
||||
void MyCpp::testMyCpp()
|
||||
{
|
||||
std::cout << "#message from CppApp" << std::endl;
|
||||
}
|
||||
}
|
||||
9
Tests/CSharpLinkToCxx/cpp_native.hpp
Normal file
9
Tests/CSharpLinkToCxx/cpp_native.hpp
Normal file
@@ -0,0 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
namespace CppApp {
|
||||
class MyCpp
|
||||
{
|
||||
public:
|
||||
void testMyCpp();
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user