tjh.dev
1--- a/cmake/QtFinishPrlFile.cmake
2+++ b/cmake/QtFinishPrlFile.cmake
3@@ -69,9 +69,10 @@ foreach(line ${lines})
4 endif()
5 list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}")
6 else()
7- # Not a framework, transform the Qt module into relocatable relative path.
8- qt_strip_library_version_suffix(relative_lib "${relative_lib}")
9- list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS]/${relative_lib}")
10+ # Not a framework, extract the library name and prepend an -l to make
11+ # it relocatable.
12+ qt_transform_absolute_library_paths_to_link_flags(lib_with_link_flag "${lib}")
13+ list(APPEND adjusted_libs "${lib_with_link_flag}")
14 endif()
15 endif()
16 else()
17--- a/cmake/QtGenerateLibHelpers.cmake
18+++ b/cmake/QtGenerateLibHelpers.cmake
19@@ -82,9 +82,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_
20 # If library_path isn't in default link directories, we should add it to link flags.
21 # But we shouldn't add it duplicately.
22 list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index)
23- if(index EQUAL -1 AND NOT "-L\"${dir}\"" IN_LIST out_list)
24- list(APPEND out_list "-L\"${dir}\"")
25- endif()
26 endif()
27 list(APPEND out_list "${lib_name_with_link_flag}")
28 else()