diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-08-13 14:05:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-13 14:05:40 (GMT) |
| commit | 39d2ce4a71c7c337060bdbe68e3ac20178789300 (patch) | |
| tree | 94aa38d27afecdd4cb93fc7a3ddaf8ba000a1304 /Source | |
| parent | 7099d113aed4789848a69869befb068e6fadafcc (diff) | |
| parent | 689be6235e5be32e8ee8e37801dde1fb1c5add2a (diff) | |
| download | CMake-39d2ce4a71c7c337060bdbe68e3ac20178789300.zip CMake-39d2ce4a71c7c337060bdbe68e3ac20178789300.tar.gz CMake-39d2ce4a71c7c337060bdbe68e3ac20178789300.tar.bz2 | |
Merge topic 'per-language-link-library-flag'
689be6235e Generator: support per-language link library flag
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3668
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 4aa18f2..0741f8b 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -285,8 +285,13 @@ cmComputeLinkInformation::cmComputeLinkInformation( } // Get options needed to link libraries. - this->LibLinkFlag = - this->Makefile->GetSafeDefinition("CMAKE_LINK_LIBRARY_FLAG"); + if (const char* flag = this->Makefile->GetDefinition( + "CMAKE_" + this->LinkLanguage + "_LINK_LIBRARY_FLAG")) { + this->LibLinkFlag = flag; + } else { + this->LibLinkFlag = + this->Makefile->GetSafeDefinition("CMAKE_LINK_LIBRARY_FLAG"); + } this->LibLinkFileFlag = this->Makefile->GetSafeDefinition("CMAKE_LINK_LIBRARY_FILE_FLAG"); this->LibLinkSuffix = |