summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-11-28 13:56:00 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-12-05 10:55:06 +0000
commit64edb40797fcd2e499022dd18d1dfe84af5f1c62 (patch)
tree35ecbe0ea0a78390d498d51419792bdd636c1c7d
parent2734df0acc47874d4ecd30c7a64d51293d26c48b (diff)
downloadmeta-boot2qt-64edb40797fcd2e499022dd18d1dfe84af5f1c62.tar.gz
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 <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt/files/qbsp/toolchain_installscript.qs2
1 files changed, 2 insertions, 0 deletions
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()
65 var debuggerId = basecomponent + ".gdb"; 65 var debuggerId = basecomponent + ".gdb";
66 var qtId = basecomponent + ".qt"; 66 var qtId = basecomponent + ".qt";
67 var cmakeId = basecomponent + ".cmake"; 67 var cmakeId = basecomponent + ".cmake";
68 var cmakeGenerator = "Unix Makefiles";
68 var icon = installer.value("B2QtDeviceIcon"); 69 var icon = installer.value("B2QtDeviceIcon");
69 var executableExt = ""; 70 var executableExt = "";
70 var hostSysroot = "x86_64-pokysdk-linux"; 71 var hostSysroot = "x86_64-pokysdk-linux";
@@ -134,6 +135,7 @@ Component.prototype.createOperations = function()
134 "--Cxxtoolchain", toolchainId + ".g++", 135 "--Cxxtoolchain", toolchainId + ".g++",
135 "--icon", icon, 136 "--icon", icon,
136 "--cmake", cmakeId, 137 "--cmake", cmakeId,
138 "--cmake-generator", cmakeGenerator,
137 "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/share/cmake/OEToolchainConfig.cmake", 139 "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/share/cmake/OEToolchainConfig.cmake",
138 "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/make" + executableExt, 140 "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/make" + executableExt,
139 "--cmake-config", "CMAKE_CXX_COMPILER:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt, 141 "--cmake-config", "CMAKE_CXX_COMPILER:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,