From 64edb40797fcd2e499022dd18d1dfe84af5f1c62 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 28 Nov 2018 13:56:00 +0200 Subject: QBSP: add cmake generator type to QtCreator configs QtCreator default to ninja if that's available in the system, but it won't work with CMAKE_MAKE_PROGRAM which we set as make. Change-Id: Id07b4f71b029245432975c02fac4d8475c695670 Reviewed-by: Mikko Gronoff --- meta-boot2qt/files/qbsp/toolchain_installscript.qs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index feee04d..4d25bf7 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -65,6 +65,7 @@ Component.prototype.createOperations = function() var debuggerId = basecomponent + ".gdb"; var qtId = basecomponent + ".qt"; var cmakeId = basecomponent + ".cmake"; + var cmakeGenerator = "Unix Makefiles"; var icon = installer.value("B2QtDeviceIcon"); var executableExt = ""; var hostSysroot = "x86_64-pokysdk-linux"; @@ -134,6 +135,7 @@ Component.prototype.createOperations = function() "--Cxxtoolchain", toolchainId + ".g++", "--icon", icon, "--cmake", cmakeId, + "--cmake-generator", cmakeGenerator, "--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, -- cgit v1.2.3-54-g00ecf