Merge remote-tracking branch 'origin/4.15'

Change-Id: I3d3dfa04124eed14952294c2847b9851dcb1a5fd
2021-05-25 16:26:54 +02:00
parent 984d992abf 0980ef7e49
commit dbd4a10d6f
24 changed files with 159 additions and 58 deletions
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
@@ -98,6 +98,8 @@ public:
    static CMakeConfig parseCMakeCacheDotTxt(const Utils::FilePath &cacheFile,
                                             QString *errorMessage);

+    static bool filteredOutTarget(const CMakeBuildTarget &target);
+
    bool isMultiConfig() const;
    bool usesAllCapsTargets() const;