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

CMake: Shift remaining data to buildsystem

Browse Source 
Change-Id: I04518a21ce571399c89608d2e59e746f8e6e0d4a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2022-05-02 18:02:37 +02:00
parent e304a25c31
commit ebf3144f22
7 changed files with 161 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@
#include "cmakeproject.h"
#include "cmakebuildconfiguration.h"
#include "cmakebuildstep.h"
#include "cmakebuildsystem.h"
#include "cmakekitinformation.h"
@@ -132,16 +131,15 @@ MakeInstallCommand CMakeProject::makeInstallCommand(const Target *target,
QStringList config;
auto bs = qobject_cast<CMakeBuildSystem*>(target->buildSystem());
auto bc = qobject_cast<CMakeBuildConfiguration*>(target->activeBuildConfiguration());
if (bs && bc) {
if (bs) {
if (bs->usesAllCapsTargets())
installTarget = "INSTALL";
if (bs->isMultiConfigReader())
config << "--config" << bc->cmakeBuildType();
config << "--config" << bs->cmakeBuildType();
}
FilePath buildDirectory = ".";
if (bc)
if (auto bc = bs->buildConfiguration())
buildDirectory = bc->buildDirectory();
cmd.arguments << "--build" << buildDirectory.onDevice(cmd.command).path()