diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-18 16:19:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-10-18 14:33:55 +0000 |
commit | 23e79ba60f7dee8b9bfd068a737b6131308a47a7 (patch) | |
tree | ec6f8c39ce7d9aed80b6e1a828789a2a8768ab5d | |
parent | 97855766bd05e90d9b2515326d44358472aa5c24 (diff) |
CMake: Put source directory last when running cmake
Tealeaf reader using CMake version 3.5.2 fails to configure any
project now that creator passes "-C something". It wrongly assumes
the provided "something" is the actual source directory.
Change-Id: I3d74cc81a18255b669ab3f9f892472c2ac5d304f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprocess.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index 8575e61cb3..e5d20de5dd 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -128,9 +128,10 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & connect(process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &CMakeProcess::handleProcessFinished); - QStringList args(srcDir); + QStringList args; args += parameters.generatorArguments; args += arguments; + args += srcDir; Utils::CommandLine commandLine(cmake->cmakeExecutable(), args); TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); |