diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-17 13:48:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-17 13:48:28 (GMT) |
| commit | 48933f5160754e33db6d4de68d8a0697e9d5d6aa (patch) | |
| tree | 0e003cfd66410f762756fe7d4b0488dee85f8337 /Source | |
| parent | 4ee96f6e7749b909d0a2baec725cdd1826e5ba61 (diff) | |
| parent | 397ee55cd62dcfcbafb4ff62b189a4192e07d1e5 (diff) | |
| download | CMake-48933f5160754e33db6d4de68d8a0697e9d5d6aa.zip CMake-48933f5160754e33db6d4de68d8a0697e9d5d6aa.tar.gz CMake-48933f5160754e33db6d4de68d8a0697e9d5d6aa.tar.bz2 | |
Merge topic 'LINK_LIBRARY-updates'
397ee55cd6 genex-LINK_LIBRARY: rename configuration variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6994
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 13 | ||||
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index e6073cb..d22a4f2 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -192,13 +192,14 @@ inline std::string ExtractFeature(std::string const& item) bool IsFeatureSupported(cmMakefile* makefile, std::string const& linkLanguage, std::string const& feature) { - auto featureSupported = - cmStrCat("CMAKE_", linkLanguage, "_LINK_USING_", feature, "_SUPPORTED"); + auto featureSupported = cmStrCat( + "CMAKE_", linkLanguage, "_LINK_LIBRARY_USING_", feature, "_SUPPORTED"); if (makefile->GetDefinition(featureSupported).IsOn()) { return true; } - featureSupported = cmStrCat("CMAKE_LINK_USING_", feature, "_SUPPORTED"); + featureSupported = + cmStrCat("CMAKE_LINK_LIBRARY_USING_", feature, "_SUPPORTED"); return makefile->GetDefinition(featureSupported).IsOn(); } } @@ -650,9 +651,9 @@ void cmComputeLinkDepends::AddLinkEntries(int depender_index, feature, "', which is undefined or unsupported.\nDid you miss to " "define it by setting variables \"CMAKE_", - this->LinkLanguage, "_LINK_USING_", feature, - "\" and \"CMAKE_", this->LinkLanguage, "_LINK_USING_", - feature, "_SUPPORTED\"?"), + this->LinkLanguage, "_LINK_LIBRARY_USING_", feature, + "\" and \"CMAKE_", this->LinkLanguage, + "_LINK_LIBRARY_USING_", feature, "_SUPPORTED\"?"), this->Target->GetBacktrace()); } } diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index cf8c9a1..9df2044 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -674,11 +674,11 @@ bool cmComputeLinkInformation::AddLibraryFeature(std::string const& feature) } auto featureName = - cmStrCat("CMAKE_", this->LinkLanguage, "_LINK_USING_", feature); + cmStrCat("CMAKE_", this->LinkLanguage, "_LINK_LIBRARY_USING_", feature); cmValue featureSupported = this->Makefile->GetDefinition(cmStrCat(featureName, "_SUPPORTED")); if (!featureSupported.IsOn()) { - featureName = cmStrCat("CMAKE_LINK_USING_", feature); + featureName = cmStrCat("CMAKE_LINK_LIBRARY_USING_", feature); featureSupported = this->Makefile->GetDefinition(cmStrCat(featureName, "_SUPPORTED")); } |