feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Use the correct generator/make for MinGW

Browse Source 
Details:  Patch by Antoine Requet
This commit is contained in:
dt
2009-03-10 11:48:37 +01:00
parent 488b04aa39
commit d73ac37b8a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -111,7 +111,11 @@ QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QStrin
QProcess * cmake = new QProcess; QProcess * cmake = new QProcess;
cmake->setWorkingDirectory(buildDirectoryPath); 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; qDebug()<<cmakeExecutable()<<sourceDirectory << arguments<<generator;
cmake->start(cmakeExecutable(), QStringList() << sourceDirectory << arguments << generator); cmake->start(cmakeExecutable(), QStringList() << sourceDirectory << arguments << generator);
return cmake; return cmake;

4
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -92,7 +92,11 @@ bool MakeStep::init(const QString &buildConfiguration)
setEnabled(buildConfiguration, true); setEnabled(buildConfiguration, true);
setWorkingDirectory(buildConfiguration, m_pro->buildDirectory(buildConfiguration)); 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? setCommand(buildConfiguration, "make"); // TODO give full path here?
#endif // Q_OS_WIN
setArguments(buildConfiguration, value(buildConfiguration, "buildTargets").toStringList()); // TODO setArguments(buildConfiguration, value(buildConfiguration, "buildTargets").toStringList()); // TODO
setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration)); setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
return AbstractProcessStep::init(buildConfiguration); return AbstractProcessStep::init(buildConfiguration);