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

Use the make command defined by the tool chain

Browse Source 
For now only for GenericProject, since the CMakeProject doesn't have the
right tool chain set on Windows yet.

Reviewed-by: dt
This commit is contained in:
Thorbjørn Lindeijer
2009-03-18 14:35:35 +01:00
parent 3904b2ad3e
commit 78d603adec
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -32,6 +32,7 @@
#include "genericproject.h"
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/toolchain.h>
#include <utils/qtcassert.h>
#include <QtGui/QFormLayout>
@@ -97,11 +98,10 @@ bool GenericMakeStep::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
if (ProjectExplorer::ToolChain *toolChain = m_pro->toolChain())
setCommand(buildConfiguration, toolChain->makeCommand());
else
setCommand(buildConfiguration, "make");
setArguments(buildConfiguration, value(buildConfiguration, "buildTargets").toStringList()); // TODO
setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
return AbstractProcessStep::init(buildConfiguration);