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>

4 files changed, 99 insertions, 0 deletions

diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 21552d7..c22a46c 100644
--- a/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/meta-boot2qt-distro/recipes-core/packagegroups/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -43,6 +43,8 @@ python __anonymous() {
 
 RDEPENDS_${PN} = "\
     nativesdk-gperf \
+    nativesdk-cmake \
+    nativesdk-make \
     ${MACHINE_EXTRA_INSTALL_SDK_HOST} \
     "
 
diff --git a/meta-boot2qt-distro/recipes-devtools/cmake/cmake_%.bbappend b/meta-boot2qt-distro/recipes-devtools/cmake/cmake_%.bbappend
new file mode 100644
index 0000000..d3603bf
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-devtools/cmake/cmake_%.bbappend
@@ -0,0 +1,36 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DEPENDS_remove_mingw32 = "ncurses"
+
+cmake_do_generate_toolchain_file_append_mingw32() {
+    cat >> ${WORKDIR}/toolchain.cmake <<EOF
+set( CMAKE_SYSTEM_NAME Windows )
+EOF
+}
diff --git a/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend b/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend
new file mode 100644
index 0000000..937c746
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-extended/libarchive/libarchive_%.bbappend
@@ -0,0 +1,30 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+EXTRA_OECONF_append_mingw32 = " --without-cng"
diff --git a/meta-boot2qt-distro/recipes-support/curl/curl_%.bbappend b/meta-boot2qt-distro/recipes-support/curl/curl_%.bbappend
new file mode 100644
index 0000000..6545343
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-support/curl/curl_%.bbappend
@@ -0,0 +1,31 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PACKAGECONFIG_remove_class-nativesdk_mingw32 = "ssl"
+RRECOMMENDS_lib${BPN}_remove_mingw32 = "ca-certificates"