diff options
| author | Erik Verbruggen <erik@verbruggen.consulting> | 2021-05-10 14:20:26 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@me.com> | 2021-06-04 13:02:56 +0000 |
| commit | b41bf33dff21f1e534645e346444cb995c766a6a (patch) | |
| tree | b841b40062de89ca98957ced6125db8e219b8a66 | |
| parent | b7218a34dda3ee29064b591d3cc2d29b3dbc1907 (diff) | |
| download | qt-creator-b41bf33dff21f1e534645e346444cb995c766a6a.tar.gz | |
Change the generator for the GHS and GHS-Arm compiler to Jom
Using Ninja not all modified files will be compiled in an incremental
build.
Fixes: UL-4247
Change-Id: I0bdb1e611e54ea6674ccae4d23391ac86f0960b8
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit 3ed6f5805688a3e39a898d6aad6f9cd2159a2f42)
| -rw-r--r-- | src/plugins/mcusupport/mcusupportoptions.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 5f9c512bb2..2742a108f1 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -757,6 +757,15 @@ static void setKitCMakeOptions(Kit *k, const McuTarget* mcuTarget, const QString if (kitNeedsQtVersion()) config.append(CMakeConfigItem("CMAKE_PREFIX_PATH", "%{Qt:QT_INSTALL_PREFIX}")); CMakeConfigurationKitAspect::setConfiguration(k, config); + + if (HostOsInfo::isWindowsHost()) { + auto type = mcuTarget->toolChainPackage()->type(); + if (type == McuToolChainPackage::TypeGHS || type == McuToolChainPackage::TypeGHSArm) { + // See https://bugreports.qt.io/browse/UL-4247?focusedCommentId=565802&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-565802 + // and https://bugreports.qt.io/browse/UL-4247?focusedCommentId=565803&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-565803 + CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM"); + } + } } static void setKitQtVersionOptions(Kit *k) |