cmake: fix cmake configurations for QtCreator

Include cmake and make as explicitly to the toolchain. Fix nativesdk-cmake
compilation for mingw toolchain. Add CMake registration code to the QBSP
installer scripts.

Task-number: QTBUG-71315
Change-Id: If29e12d6ce24546ba8a834969b6f60e3216e6962
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

3 files changed, 24 insertions, 3 deletions

diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
index ee1a25f..1f7b3c2 100644
--- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -88,8 +88,10 @@ EOF
     echo "set(CMAKE_C_COMPILER_ARG1 \"\${compiler_flags}\")" >> ${MACHINE_CMAKE}
     echo "set(CMAKE_CXX_COMPILER_ARG1 \"\${compiler_flags}\")" >> ${MACHINE_CMAKE}
     echo "set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS})" >> ${MACHINE_CMAKE}
-    mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
-    install -m 0644 ${MACHINE_CMAKE} ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
+}
+
+create_sdk_files_append_sdkmingw32 () {
+    echo "set(OE_QMAKE_BIN_SUFFIX .exe)" >> ${MACHINE_CMAKE}
 }
 
 create_qtcreator_configure_script () {
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 3e5db2d..a7ea288 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -152,6 +152,7 @@ ${SDKTOOL} addKit \
     --mkspec "${MKSPEC}" \
     --cmake "${BASEID}.cmake" \
     --cmake-config "CMAKE_TOOLCHAIN_FILE:FILEPATH=${OECORE_NATIVE_SYSROOT}/usr/share/cmake/OEToolchainConfig.cmake" \
+    --cmake-config "CMAKE_MAKE_PROGRAM:FILEPATH=$(type -p make)" \
     --cmake-config "CMAKE_CXX_COMPILER:FILEPATH=$(type -p ${CXX})" \
     --cmake-config "CMAKE_C_COMPILER:FILEPATH=$(type -p ${CC})"
 
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 7cef6bc..feee04d 100644
--- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
@@ -56,17 +56,22 @@ Component.prototype.createOperations = function()
         component.addOperation("Replace",
                                 path + "/sysroots/i686-pokysdk-mingw32/usr/bin/qt.conf",
                                 sdkPath, path);
+        component.addOperation("Replace",
+                                path + "/sysroots/i686-pokysdk-mingw32/usr/share/cmake/OEToolchainConfig.cmake.d/" + device + ".cmake",
+                                sdkPath, path);
     }
     var basecomponent = component.name.substring(0, component.name.lastIndexOf("."));
     var toolchainId = "ProjectExplorer.ToolChain.Gcc:" + component.name;
     var debuggerId = basecomponent + ".gdb";
     var qtId = basecomponent + ".qt";
+    var cmakeId = basecomponent + ".cmake";
     var icon = installer.value("B2QtDeviceIcon");
     var executableExt = "";
     var hostSysroot = "x86_64-pokysdk-linux";
     if (systemInfo.kernelType === "winnt") {
         executableExt = ".exe";
         hostSysroot = "i686-pokysdk-mingw32";
+        toolchainId = "ProjectExplorer.ToolChain.Mingw:" + component.name;
     }
 
     component.addOperation("Execute",
@@ -109,6 +114,14 @@ Component.prototype.createOperations = function()
          "@SDKToolBinary@", "rmQt", "--id", qtId]);
 
     component.addOperation("Execute",
+        ["@SDKToolBinary@", "addCMake",
+        "--id", cmakeId,
+        "--name", "CMake (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/cmake" + executableExt,
+        "UNDOEXECUTE",
+        "@SDKToolBinary@", "rmCMake", "--id", cmakeId]);
+
+    component.addOperation("Execute",
         ["@SDKToolBinary@", "addKit",
          "--id", basecomponent,
          "--name", platform + " " + target,
@@ -120,6 +133,11 @@ Component.prototype.createOperations = function()
          "--Ctoolchain", toolchainId + ".gcc",
          "--Cxxtoolchain", toolchainId + ".g++",
          "--icon", icon,
+         "--cmake", cmakeId,
+         "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/share/cmake/OEToolchainConfig.cmake",
+         "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/make" + executableExt,
+         "--cmake-config", "CMAKE_CXX_COMPILER:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
+         "--cmake-config", "CMAKE_C_COMPILER:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
          "UNDOEXECUTE",
          "@SDKToolBinary@", "rmKit", "--id", basecomponent]);
 }