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

CMake: Use local builddir path when constructing cmakeCommand

Browse Source 
The command will be executed on the build device, from that perspective
the builddir is local.

Change-Id: I9b3bdf0333f2634caff352e8738019a86c09870c
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-06-03 07:57:40 +02:00
parent 953689ec63
commit d632b3eb4f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,10 +378,10 @@ CommandLine CMakeBuildStep::cmakeCommand() const
{ {
CMakeTool *tool = CMakeKitAspect::cmakeTool(kit()); CMakeTool *tool = CMakeKitAspect::cmakeTool(kit());
Utils::CommandLine cmd(tool ? tool->cmakeExecutable() : Utils::FilePath(), {}); CommandLine cmd(tool ? tool->cmakeExecutable() : FilePath(), {});
QString buildDirectory = "."; QString buildDirectory = ".";
if (buildConfiguration()) if (buildConfiguration())
buildDirectory = buildConfiguration()->buildDirectory().toString(); buildDirectory = buildConfiguration()->buildDirectory().path();
cmd.addArgs({"--build", buildDirectory}); cmd.addArgs({"--build", buildDirectory});
cmd.addArg("--target"); cmd.addArg("--target");