From 15a7e08eda4aec93094575e74473c6d5ea635318 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 22 Dec 2020 16:57:54 +0100 Subject: [PATCH] CMakeProjectManager: Add "install/strip" and "package" special targets The Ninja / Makefile generator supports these targets as seen at: https://cmake.org/cmake/help/latest/generator/Ninja.html https://cmake.org/cmake/help/latest/generator/Unix%20Makefiles.html Fixes: QTCREATORBUG-22620 Fixes: QTCREATORBUG-22047 Change-Id: Id0105ae59b7d699f0da637efed4efa337769b601 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 13 ++++++++++++- src/plugins/cmakeprojectmanager/cmakebuildstep.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index d0a40ffe051..46db12d593f 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -416,6 +416,16 @@ QString CMakeBuildStep::installTarget() return QString("install"); } +QString CMakeBuildStep::installStripTarget() +{ + return QString("install/strip"); +} + +QString CMakeBuildStep::packageTarget() +{ + return QString("package"); +} + QString CMakeBuildStep::testTarget() { return QString("test"); @@ -423,7 +433,8 @@ QString CMakeBuildStep::testTarget() QStringList CMakeBuildStep::specialTargets() { - return { allTarget(), cleanTarget(), installTarget(), testTarget() }; + return { allTarget(), cleanTarget(), installTarget(), installStripTarget(), + packageTarget(), testTarget() }; } QString CMakeBuildStep::activeRunConfigTarget() const diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index caaddf7d446..68d239e81eb 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h @@ -72,6 +72,8 @@ public: static QString cleanTarget(); static QString allTarget(); static QString installTarget(); + static QString installStripTarget(); + static QString packageTarget(); static QString testTarget(); static QStringList specialTargets();