diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-03-19 17:22:45 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-03-21 08:46:31 +0000 |
| commit | 1d5f9fcc8a14e4826943a913fe22e819a0837b80 (patch) | |
| tree | 454d3725859afd120f4f15679d70707101880739 /mkspecs | |
| parent | 0a0643345f6c2c6d71cf489c6aba3026e81a0e0f (diff) | |
Handle quotes in .prl files
Do remove quotes around libraries before trying to parse them.
This patch is a follow-up to eda28621f6c1a68774719f, and fixes
an issue on Windows where e.g. Qt5AxServer.prl contains entries
like
"-lole32"
Fixes: QTBUG-73475
Change-Id: I3d1353de618328a0d44bacd4dbd6aba8fc66b1b7
Reviewed-by: Kyle Edwards <kyle.edwards@kitware.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in index d6773d6e98..b643e5edf9 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -62,6 +62,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(_search_paths) string(REPLACE \"\\$\\$[QT_INSTALL_LIBS]\" \"${_qt5_install_libs}\" _static_depends \"${_static_depends}\") foreach(_flag ${_static_depends}) + string(REPLACE \"\\\"\" \"\" _flag ${_flag}) if(_flag MATCHES \"^-l(.*)$\") # Handle normal libraries passed as -lfoo set(_lib \"${CMAKE_MATCH_1}\") |