From 07cc8b02a015941a9c9f93667de5daf708282efe Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 15 Oct 2020 09:28:29 +0300
Subject: 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>
---
 classes/populate_sdk_qt6_base.bbclass | 10 ++++++++++
 1 file changed, 10 insertions(+)

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() {
-- 
cgit v1.2.3