mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
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 Pick-to: 6.3 6.2 Change-Id: I48542f20f4443c8130f89c2436f5b0ecea914bb0 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
parent
92b8d16b73
commit
e78c281c0a
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user