diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-02-09 11:36:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-10 13:45:39 +0000 |
| commit | 2a751aeeb1fe8b34811f1a8ceb733ec50733c6ee (patch) | |
| tree | 0bbc1d77a1a85e7e16ba77cf63d990007b709a47 | |
| parent | 2c6531dbfe71c94d1a93df8e074f284c2a3f7748 (diff) | |
sdk: use relativate path with cmake toolchain file
Paths in mingw toolchain are not relocated when installed, so we
need to use relative path for the Qt6Toolchain.cmake file.
Fixes: QTBUG-100642
Change-Id: I48542f20f4443c8130f89c2436f5b0ecea914bb0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e78c281c0a0722228cae1169fff08691db1dbcd6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | classes/populate_sdk_qt6_base.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index e7cc4d3..0a01cce 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -97,8 +97,9 @@ include("\${CMAKE_TOOLCHAIN_FILE}") EOF # and use that from the default toolchain file qt.toolchain.cmake + RELPATH=${@os.path.relpath('/usr/share/cmake/Qt6Toolchain.cmake', d.getVar('QT6_INSTALL_LIBDIR') + '/cmake/Qt6')} sed -i ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}/cmake/Qt6/qt.toolchain.cmake \ - -e 's|/.*/toolchain.cmake|${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake|' + -e "s|/.*/toolchain.cmake|\${CMAKE_CURRENT_LIST_DIR}/$RELPATH|" } create_qt6_sdk_files:append:sdkmingw32() { |