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

CMakeProjectManager: Support for multi-config generators

Browse Source 
CMake has multi-config generators like:

  * Visual Studio
  * Xcode
  * Ninja Multi-Config

The first two have different special targets for "all", "install",
"package", "test" namely: "ALL_BUILD", "INSTALL", "PACKAGE",
"RUN_TESTS".

All of them need to get the build type passed via "--config <build-
type>" and not via "CMAKE_BUILD_TYPE".

The multi-config generators will use only one build directory.

Fixes: QTCREATORBUG-24984
Change-Id: I8aa7ff73ce2af1e163b21a6504d26fcf95530edf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2021-01-14 16:38:55 +01:00
parent f3d7717b31
commit 6cbdae8070
22 changed files with 238 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -69,13 +69,10 @@ public:
QVariantMap toMap() const override;
static QString cleanTarget();
static QString allTarget();
static QString installTarget();
static QString installStripTarget();
static QString packageTarget();
static QString testTarget();
static QStringList specialTargets();
QString cleanTarget() const;
QString allTarget() const ;
QString installTarget() const;
static QStringList specialTargets(bool allCapsTargets);
QString activeRunConfigTarget() const;
@@ -110,6 +107,9 @@ private:
Utils::StringAspect *m_toolArguments = nullptr;
bool m_waiting = false;
QString m_allTarget = "all";
QString m_installTarget = "install";
Utils::TreeModel<Utils::TreeItem, CMakeTargetItem> m_buildTargetModel;
};