From f97448812860c682e5e7cf716478c8ee24a577be Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 10 Jun 2022 16:41:27 +0200 Subject: ProjectExplorer: Move makeInstallCommand() ... from Project to BuildSystem. More direct and less use of Target::activeBuildConfiguration(). Change-Id: I148381d23be0f9ab0750ed1440e1b2b3e25aded0 Reviewed-by: Christian Kandeler --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 36 ------------------------ 1 file changed, 36 deletions(-) (limited to 'src/plugins/cmakeprojectmanager/cmakeproject.cpp') diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 445e9b1ab3..ee6696b0e6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -116,40 +116,4 @@ ProjectExplorer::DeploymentKnowledge CMakeProject::deploymentKnowledge() const : DeploymentKnowledge::Bad; } -MakeInstallCommand CMakeProject::makeInstallCommand(const Target *target, - const FilePath &installRoot) -{ - MakeInstallCommand cmd; - if (const BuildConfiguration * const bc = target->activeBuildConfiguration()) { - if (const auto cmakeStep = bc->buildSteps()->firstOfType()) { - if (CMakeTool *tool = CMakeKitAspect::cmakeTool(target->kit())) - cmd.command.setExecutable(tool->cmakeExecutable()); - } - } - - QString installTarget = "install"; - QStringList config; - - auto bs = qobject_cast(target->buildSystem()); - QTC_ASSERT(bs, return {}); - - if (bs->usesAllCapsTargets()) - installTarget = "INSTALL"; - if (bs->isMultiConfigReader()) - config << "--config" << bs->cmakeBuildType(); - - FilePath buildDirectory = "."; - if (auto bc = bs->buildConfiguration()) - buildDirectory = bc->buildDirectory(); - - cmd.command.addArg("--build"); - cmd.command.addArg(buildDirectory.onDevice(cmd.command.executable()).path()); - cmd.command.addArg("--target"); - cmd.command.addArg(installTarget); - cmd.command.addArgs(config); - - cmd.environment.set("DESTDIR", installRoot.nativePath()); - return cmd; -} - } // namespace CMakeProjectManager -- cgit v1.2.1