diff options
| author | Daniel Teske <[email protected]> | 2012-09-11 15:59:17 +0200 |
|---|---|---|
| committer | Daniel Teske <[email protected]> | 2012-09-12 16:29:30 +0200 |
| commit | d3c0557444928b8a3b2812622b7d1137f81e05aa (patch) | |
| tree | 1ddbc010b55d969a11b2c30e6a2d32deb8e48b8e /src/plugins/cmakeprojectmanager/makestep.cpp | |
| parent | f89352d7a87106ffbed9875c74fb3b61ff920029 (diff) | |
Make Toolchain::makeCommand return a full path to the make command
Requires passing in the environment to use. Also now the mingw toolchain
has a fall back to make.exe on windows. And the msvc toolchain falls
back to nmake even if the "use Jom" option is used.
Task-number: QTCREATORBUG-7831
Change-Id: I850a96da41a380eef8c6992e27a72fb63958c456
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: Peter Kümmel <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/makestep.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/makestep.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index cb54f8a4b93..2126d814e21 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -151,7 +151,7 @@ bool MakeStep::init() pp->setEnvironment(bc->environment()); pp->setWorkingDirectory(bc->buildDirectory()); if (tc) - pp->setCommand(tc->makeCommand()); + pp->setCommand(tc->makeCommand(bc->environment())); else pp->setCommand(QLatin1String("make")); pp->setArguments(arguments); @@ -283,6 +283,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) connect(pro, SIGNAL(buildTargetsChanged()), this, SLOT(buildTargetsChanged())); + connect(pro, SIGNAL(environmentChanged()), this, SLOT(updateDetails())); } void MakeStepConfigWidget::additionalArgumentsEdited() @@ -336,7 +337,7 @@ void MakeStepConfigWidget::updateDetails() param.setMacroExpander(bc->macroExpander()); param.setEnvironment(bc->environment()); param.setWorkingDirectory(bc->buildDirectory()); - param.setCommand(tc->makeCommand()); + param.setCommand(tc->makeCommand(bc->environment())); param.setArguments(arguments); m_summaryText = param.summary(displayName()); } else { |