diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-10-15 09:28:29 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-10-16 10:14:02 +0300 |
| commit | 07cc8b02a015941a9c9f93667de5daf708282efe (patch) | |
| tree | 20b1fbd997bff5a3a89c40b4a0446f08beb7e01b | |
| parent | 59024d081c9c59e5700668cda154dfad389c45e6 (diff) | |
sdk: make qt-cmake usable from the sdk
By default qt-cmake contains paths to the build time locations.
Overwrite it so that it's usable from the SDK. Set toolchain file
to Qt6Toolchain.cmake making it work without need to source the
environment-setup script.
Change-Id: I157c0ad3cdb814438be03028a0e045abb85bf058
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | classes/populate_sdk_qt6_base.bbclass | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index dcc1be1..eb8ade4 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -80,6 +80,16 @@ set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE PATH "Install path prefix") set(CMAKE_TOOLCHAIN_FILE "${SDKPATHNATIVE}/usr/share/cmake/OEToolchainConfig.cmake") include("\${CMAKE_TOOLCHAIN_FILE}") EOF + + # override qt-cmake + cat > ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/qt-cmake <<EOF +#!/bin/sh + +cmake_path="${SDKPATHNATIVE}${bindir}/cmake" +toolchain_path="${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake" +exec "\$cmake_path" -DCMAKE_TOOLCHAIN_FILE="\$toolchain_path" "\$@" +EOF + } create_qt6_sdk_files_append_sdkmingw32() { |