1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Do not use $$[QT_INSTALL_LIBS/get] in generated .prl files

Browse Source 
We do not support building with qmake from the build directory in prefix
builds. Therefore we can just use the standard QT_INSTALL_LIBS property
instead of the /get variant.

Change-Id: I82ccaf1894fb1dccc9ec18b4984b582b555ce0f8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-06-16 10:36:50 +02:00
parent e817ac3d68
commit bd2a14ff98
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtFinishPrlFile.cmake
View File

@ -1,6 +1,6 @@
# Finish a preliminary .prl file. # Finish a preliminary .prl file.
# #
# - Replaces occurrences of the build libdir with $$[QT_INSTALL_LIBDIR/get]. # - Replaces occurrences of the build libdir with $$[QT_INSTALL_LIBDIR].
# - Strips version number suffixes from absolute paths, because qmake's lflag # - Strips version number suffixes from absolute paths, because qmake's lflag
# merging does not handle them correctly. # merging does not handle them correctly.
# #
@ -38,7 +38,7 @@ foreach(line ${lines})
if(IS_ABSOLUTE "${relative_lib}" OR (relative_lib MATCHES "^\\.\\.")) if(IS_ABSOLUTE "${relative_lib}" OR (relative_lib MATCHES "^\\.\\."))
list(APPEND adjusted_libs "${lib}") list(APPEND adjusted_libs "${lib}")
else() else()
list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS/get]/${relative_lib}") list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS]/${relative_lib}")
endif() endif()
else() else()
if(NOT lib MATCHES "^-l" AND NOT lib MATCHES "^-framework") if(NOT lib MATCHES "^-l" AND NOT lib MATCHES "^-framework")