summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-06-01 12:35:49 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-06-01 12:35:56 (GMT)
commit5eb2aa1f57e99f30be5ea145ce9af5fd9652392f (patch)
tree20ec33b57ee8da2737aa53376aa46032bf8860a8 /Modules
parent54cc20137cb5ea304a298dc63e68c86ebe6a2b89 (diff)
parent3941555d935afad8343c66f39579bfc611201a6f (diff)
downloadCMake-5eb2aa1f57e99f30be5ea145ce9af5fd9652392f.zip
CMake-5eb2aa1f57e99f30be5ea145ce9af5fd9652392f.tar.gz
CMake-5eb2aa1f57e99f30be5ea145ce9af5fd9652392f.tar.bz2
Merge topic 'link-objects-first'
3941555d93 target_link_libraries: Place $<TARGET_OBJECTS> before libraries f530b3a267 OpenWatcom: Add infrastructure to link to object files 8a4ca110e4 cmComputeLinkInformation: Improve type safety of item IsPath member 83ad066ed1 cmComputeTargetDepends: Factor out helper to add object library dependency 7f506b95a7 cmGeneratorTarget: Refactor link item lookup 96809a8541 cmGeneratorTarget: Give temporary link impl item an explicit name ddffbb8adb cmMakefile: Register explicit object sources more efficiently 18e42d3e63 cmGeneratorExpressionNode: Constify local variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6166
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Compiler/OpenWatcom.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/Compiler/OpenWatcom.cmake b/Modules/Compiler/OpenWatcom.cmake
index ec36908..8cfe683 100644
--- a/Modules/Compiler/OpenWatcom.cmake
+++ b/Modules/Compiler/OpenWatcom.cmake
@@ -7,6 +7,7 @@ include_guard()
set(CMAKE_LIBRARY_PATH_FLAG "libpath ")
set(CMAKE_LINK_LIBRARY_FLAG "library ")
set(CMAKE_LINK_LIBRARY_FILE_FLAG "library ")
+set(CMAKE_LINK_OBJECT_FILE_FLAG "file ")
if(CMAKE_VERBOSE_MAKEFILE)
set(CMAKE_WCL_QUIET)