diff options
author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2018-03-22 16:09:43 (GMT) |
---|---|---|
committer | Michael Stürmer <michael.stuermer@schaeffler.com> | 2018-04-24 05:05:17 (GMT) |
commit | 663f5120f4e20ec716c742fea1d35cced3e3871f (patch) | |
tree | 514f896db9c075ccf224af6c7af0d292f27c78ba | |
parent | 359544a9074a26c3d5d7801932c809048763c341 (diff) | |
download | CMake-663f5120f4e20ec716c742fea1d35cced3e3871f.zip CMake-663f5120f4e20ec716c742fea1d35cced3e3871f.tar.gz CMake-663f5120f4e20ec716c742fea1d35cced3e3871f.tar.bz2 |
cmGlobalVisualStudioGenerator: remove TargetCanBeReferenced()
-rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 13 | ||||
-rw-r--r-- | Source/cmGlobalVisualStudioGenerator.h | 3 | ||||
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
3 files changed, 4 insertions, 17 deletions
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index a0e5d06..1175acf 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -734,19 +734,6 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly( 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()( cmGeneratorTarget const* l, cmGeneratorTarget const* r) const { diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h index da1f9a4..07bc9a3 100644 --- a/Source/cmGlobalVisualStudioGenerator.h +++ b/Source/cmGlobalVisualStudioGenerator.h @@ -81,9 +81,6 @@ public: // return true if target is fortran only 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. */ std::string GetRegistryBase(); diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 351f530..269bc11 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3773,7 +3773,10 @@ void cmVisualStudio10TargetGenerator::WriteProjectReferences() "{" + this->GlobalGenerator->GetGUID(name) + "}", 3); this->WriteElem("Name", name, 3); 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->WriteString("</ProjectReference>\n", 2); |