McuSupport: Remove explicit appointment of Jom as CMAKE_MAKE_PROGRAM

Detecting the presence of Jom, setting CMAKE_MAKE_PROGRAM to it and
choosing "NMake Makefiles JOM" as CMake generator was implemented in a
time where the Qt SDK did not yet ship ninja.

By now, ninja is shipped and it *should* be automatically installed as
dependency of Qt for MCUs. Qt Creator will by default prefer ninja as
generator/buildtool if it is installed.

Task-number: QTMCU-18
Change-Id: Ia83ac3a454b90bb5b5b69ddefb3fbb8f23fa15c9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <christiaan.janssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

1 files changed, 0 insertions, 14 deletions

diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index 55ebe006a9..1413970dad 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -563,13 +563,6 @@ FilePath McuSupportOptions::qulDirFromSettings()
                                         QSettings::UserScope));
 }
 
-static FilePath jomExecutablePath()
-{
-    return HostOsInfo::isWindowsHost()
-            ? FilePath::fromUserInput(Core::ICore::libexecPath() + "/jom.exe")
-            : FilePath();
-}
-
 static void setKitProperties(const QString &kitName, Kit *k, const McuTarget *mcuTarget)
 {
     using namespace Constants;
@@ -589,8 +582,6 @@ static void setKitProperties(const QString &kitName, Kit *k, const McuTarget *mc
     QSet<Id> irrelevant = { SysRootKitAspect::id() };
     if (!kitNeedsQtVersion())
         irrelevant.insert(QtSupport::QtKitAspect::id());
-    if (jomExecutablePath().exists()) // TODO: add id() getter to CMakeGeneratorKitAspect
-        irrelevant.insert("CMake.GeneratorKitInformation");
     k->setIrrelevantAspects(irrelevant);
 }
 
@@ -694,11 +685,6 @@ static void setKitCMakeOptions(Kit *k, const McuTarget* mcuTarget, const QString
     if (mcuTarget->colorDepth() >= 0)
         config.append(CMakeConfigItem("QUL_COLOR_DEPTH",
                                       QString::number(mcuTarget->colorDepth()).toLatin1()));
-    const FilePath jom = jomExecutablePath();
-    if (jom.exists()) {
-        config.append(CMakeConfigItem("CMAKE_MAKE_PROGRAM", jom.toString().toLatin1()));
-        CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM");
-    }
     if (kitNeedsQtVersion())
         config.append(CMakeConfigItem("CMAKE_PREFIX_PATH", "%{Qt:QT_INSTALL_PREFIX}"));
     CMakeConfigurationKitAspect::setConfiguration(k, config);