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

Docker: Map build directory to device in cmake calls

Browse Source 
Change-Id: Ibcd2e1aebac337e880a28a2a22b35d8ca60b6dcf
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2021-10-18 10:23:35 +02:00
parent 2316f07db5
commit 665285b981
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -140,11 +140,12 @@ MakeInstallCommand CMakeProject::makeInstallCommand(const Target *target,
config << "--config" << bc->cmakeBuildType();
}
QString buildDirectory = ".";
FilePath buildDirectory = ".";
if (bc)
buildDirectory = bc->buildDirectory().toString();
buildDirectory = bc->buildDirectory();
cmd.arguments << "--build" << buildDirectory << "--target" << installTarget << config;
cmd.arguments << "--build" << buildDirectory.onDevice(cmd.command).mapToDevicePath()
<< "--target" << installTarget << config;
cmd.environment.set("DESTDIR", QDir::toNativeSeparators(installRoot));
return cmd;