Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced()

Browse Source
This commit is contained in:
Michael Stürmer
2018-03-22 17:09:43 +01:00
parent 359544a907
commit 663f5120f4
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalVisualStudioGenerator.cxx
View File

@@ -734,19 +734,6 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly(
return false; return false;
} }
bool cmGlobalVisualStudioGenerator::TargetCanBeReferenced(
cmGeneratorTarget const* gt)
{
if (gt->GetManagedType("") != cmGeneratorTarget::ManagedType::Native) {
return true;
}
if (gt->GetType() != cmStateEnums::SHARED_LIBRARY &&
gt->GetType() != cmStateEnums::EXECUTABLE) {
return false;
}
return true;
}
bool cmGlobalVisualStudioGenerator::TargetCompare::operator()( bool cmGlobalVisualStudioGenerator::TargetCompare::operator()(
cmGeneratorTarget const* l, cmGeneratorTarget const* r) const cmGeneratorTarget const* l, cmGeneratorTarget const* r) const
{ {

3
Source/cmGlobalVisualStudioGenerator.h
View File

@@ -81,9 +81,6 @@ public:
// return true if target is fortran only // return true if target is fortran only
bool TargetIsFortranOnly(const cmGeneratorTarget* gt); bool TargetIsFortranOnly(const cmGeneratorTarget* 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. */ /** Get the top-level registry key for this VS version. */
std::string GetRegistryBase(); std::string GetRegistryBase();

5
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -3773,7 +3773,10 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences()
"{" + this->GlobalGenerator->GetGUID(name) + "}", 3); "{" + this->GlobalGenerator->GetGUID(name) + "}", 3);
this->WriteElem("Name", name, 3); this->WriteElem("Name", name, 3);
this->WriteDotNetReferenceCustomTags(name); this->WriteDotNetReferenceCustomTags(name);
if (!this->GlobalGenerator->TargetCanBeReferenced(dt)) { // If the target is not compiled with any /clr flag, there is
// no assembly to reference.
if (this->Managed &&
dt->GetManagedType("") < cmGeneratorTarget::ManagedType::Mixed) {
this->WriteElem("ReferenceOutputAssembly", "false", 3); this->WriteElem("ReferenceOutputAssembly", "false", 3);
} }
this->WriteString("</ProjectReference>\n", 2); this->WriteString("</ProjectReference>\n", 2);