diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-16 10:36:50 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-16 17:56:21 +0200 |
| commit | bd2a14ff9897b8bda0e9bd21f8472b1a5a7dd6f6 (patch) | |
| tree | 271633b3a7d9d6d0246c55cada16561501f5c797 | |
| parent | e817ac3d68295fc0670ccede4df08bf1c7e627d2 (diff) | |
CMake: Do not use $$[QT_INSTALL_LIBS/get] in generated .prl files
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>
| -rw-r--r-- | cmake/QtFinishPrlFile.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake index e584beb06b..c7c913d4ae 100644 --- a/cmake/QtFinishPrlFile.cmake +++ b/cmake/QtFinishPrlFile.cmake @@ -1,6 +1,6 @@ # 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 # merging does not handle them correctly. # @@ -38,7 +38,7 @@ foreach(line ${lines}) if(IS_ABSOLUTE "${relative_lib}" OR (relative_lib MATCHES "^\\.\\.")) list(APPEND adjusted_libs "${lib}") else() - list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS/get]/${relative_lib}") + list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS]/${relative_lib}") endif() else() if(NOT lib MATCHES "^-l" AND NOT lib MATCHES "^-framework") |