From e7b4e91fec16e98342623849f528c257eae02db2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 26 Apr 2017 15:27:01 +0200 Subject: [PATCH] CMake: Define an "install" target Change-Id: I036ddc3bfb91fc3a5a9e8923db2befbf60e89a77 Reviewed-by: Tim Jenssen --- .../cmakeprojectmanager/cmakebuildstep.cpp | 16 +++++++++++++--- src/plugins/cmakeprojectmanager/cmakebuildstep.h | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 78d57cf5eea..a8ca10bf867 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -132,7 +132,7 @@ void CMakeBuildStep::handleBuildTargetChanges() if (isCurrentExecutableTarget(m_buildTarget)) return; // Do not change just because a different set of build targets is there... if (!static_cast(project())->buildTargetTitles().contains(m_buildTarget)) - setBuildTarget(CMakeBuildStep::allTarget()); + setBuildTarget(allTarget()); emit buildTargetsChanged(); } @@ -381,12 +381,22 @@ QString CMakeBuildStep::cmakeCommand() const QString CMakeBuildStep::cleanTarget() { - return QLatin1String("clean"); + return "clean"; } QString CMakeBuildStep::allTarget() { - return QLatin1String("all"); + return "all"; +} + +QString CMakeBuildStep::installTarget() +{ + return "install"; +} + +QStringList CMakeBuildStep::specialTargets() +{ + return { allTarget(), cleanTarget(), installTarget() }; } // diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index e7cec2c3b6d..e740baeaa75 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h @@ -79,6 +79,8 @@ public: static QString cleanTarget(); static QString allTarget(); + static QString installTarget(); + static QStringList specialTargets(); signals: void cmakeCommandChanged();