Fixes: Use the correct generator/make for MinGW

Details:  Patch by Antoine Requet

2 files changed, 9 insertions, 1 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 4032b142336..61de34e01eb 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -111,7 +111,11 @@ QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QStrin
     QProcess * cmake = new QProcess;
     cmake->setWorkingDirectory(buildDirectoryPath);
 
-    QString generator = "-GCodeBlocks - Unix Makefiles";
+#ifdef Q_OS_WIN
+    QString generator = "-GCodeBlocks - MinGW Makefiles";
+#else // Q_OS_WIN
+   QString generator = "-GCodeBlocks - Unix Makefiles";
+#endif // Q_OS_WIN
     qDebug()<<cmakeExecutable()<<sourceDirectory << arguments<<generator;
     cmake->start(cmakeExecutable(), QStringList() << sourceDirectory << arguments << generator);
     return cmake;
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 9c0a488b22f..33dcd1fe8a3 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -92,7 +92,11 @@ bool MakeStep::init(const QString &buildConfiguration)
 
     setEnabled(buildConfiguration, true);
     setWorkingDirectory(buildConfiguration, m_pro->buildDirectory(buildConfiguration));
+#ifdef Q_OS_WIN
+    setCommand(buildConfiguration, "mingw32-make");
+#else // Q_OS_WIN
     setCommand(buildConfiguration, "make"); // TODO give full path here?
+#endif // Q_OS_WIN
     setArguments(buildConfiguration, value(buildConfiguration, "buildTargets").toStringList()); // TODO
     setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
     return AbstractProcessStep::init(buildConfiguration);