summaryrefslogtreecommitdiffstats
path: root/Source/cmLinkLineComputer.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-08-02 15:51:55 (GMT)
committerBrad King <brad.king@kitware.com>2019-08-02 17:37:39 (GMT)
commitf6d6dbc2933248dc7f17fd033e2b70fb161fddbd (patch)
tree10c7806d7cd434d252e9f5d178a546de65d5fdaa /Source/cmLinkLineComputer.cxx
parent7bacf0233be03100b830e65cdd02a0d1fb2c2a13 (diff)
downloadCMake-f6d6dbc2933248dc7f17fd033e2b70fb161fddbd.zip
CMake-f6d6dbc2933248dc7f17fd033e2b70fb161fddbd.tar.gz
CMake-f6d6dbc2933248dc7f17fd033e2b70fb161fddbd.tar.bz2
Make CMAKE_LINK_LIBRARY_FILE_FLAG work like CMAKE_LINK_LIBRARY_FLAG
The `CMAKE_LINK_LIBRARY_FILE_FLAG` variable is meant for linkers that want library file paths to be preceded by a flag. This is used only for OpenWatcom to add the `library` argument before library file paths. Refactor the approach to treat `CMAKE_LINK_LIBRARY_FILE_FLAG` as a command-line string fragment to add just before the library file path. This has two advantages: * `CMAKE_LINK_LIBRARY_FILE_FLAG` now works like `CMAKE_LINK_LIBRARY_FLAG`. * `CMAKE_LINK_LIBRARY_FILE_FLAG` can now be an attached flag whose value is the library file path. Technically this is a change in behavior, but this setting was created for internal use and should be rarely used outside of CMake itself. Fixes: #19541
Diffstat (limited to 'Source/cmLinkLineComputer.cxx')
-rw-r--r--Source/cmLinkLineComputer.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 8746b35..4430f97 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -63,6 +63,7 @@ std::string cmLinkLineComputer::ComputeLinkLibs(cmComputeLinkInformation& cli)
continue;
}
if (item.IsPath) {
+ linkLibs += cli.GetLibLinkFileFlag();
linkLibs +=
this->ConvertToOutputFormat(this->ConvertToLinkReference(item.Value));
} else {