From aaf86ae6360661592d3423f9a5cbb8f7b673e5ac Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 21 Dec 2016 10:49:49 +0100 Subject: SDKtool: Fix cmake related options to addKit Change-Id: Ib51656957593b2f159bd4ef31e3be9840938cd81 Reviewed-by: Richard Pannek Reviewed-by: Alessandro Portale --- src/tools/sdktool/addkitoperation.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/tools') diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp index aadeb00d7f..ff8ad11b1a 100644 --- a/src/tools/sdktool/addkitoperation.cpp +++ b/src/tools/sdktool/addkitoperation.cpp @@ -665,7 +665,7 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t if (!mkspec.isNull()) data << KeyValuePair({ kit, DATA, MKSPEC }, QVariant(mkspec)); if (!cmakeId.isNull()) - data << KeyValuePair({kit, CMAKE_ID}, QVariant(cmakeId)); + data << KeyValuePair({kit, DATA, CMAKE_ID}, QVariant(cmakeId)); if (!cmakeGenerator.isNull()) { QVariantMap generatorMap; generatorMap.insert("Generator", cmakeGenerator); @@ -675,11 +675,10 @@ QVariantMap AddKitOperation::addKit(const QVariantMap &map, const QVariantMap &t generatorMap.insert("Toolset", cmakeGeneratorToolset); if (!cmakeGeneratorPlatform.isNull()) generatorMap.insert("Platform", cmakeGeneratorPlatform); - data << KeyValuePair({ kit, CMAKE_GENERATOR }, generatorMap); - } - if (!cmakeConfiguration.isEmpty()) { - data << KeyValuePair({kit, CMAKE_CONFIGURATION}, QVariant(cmakeConfiguration)); + data << KeyValuePair({ kit, DATA, CMAKE_GENERATOR }, generatorMap); } + if (!cmakeConfiguration.isEmpty()) + data << KeyValuePair({kit, DATA, CMAKE_CONFIGURATION}, QVariant(cmakeConfiguration)); if (!env.isEmpty()) data << KeyValuePair({ kit, DATA, ENV }, QVariant(env)); -- cgit v1.2.1