From 01538332da659fc1b5494bc8095dc42700b22c2e Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 17 Apr 2024 21:40:11 +0200 Subject: [PATCH] =?UTF-8?q?CMakePM:=20Treat=20all=20default=20CMake=20sour?= =?UTF-8?q?ce=20groups=20as=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … "Header|Sources Files" groups Amends f76e0de7bc98a3d7171390d682bb5046ddfce634 Change-Id: I5e19427a481e87fb4d9761e3fad1727df52ca28b Reviewed-by: Marcus Tillmanns --- src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 4 ++-- src/plugins/cmakeprojectmanager/projecttreehelper.cpp | 9 ++++++--- src/plugins/cmakeprojectmanager/projecttreehelper.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index ea156be8a11..f4212a1a486 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -685,7 +685,7 @@ static void addCompileGroups(ProjectNode *targetRoot, node->setIsGenerated(true); const bool showSourceFolders = settings().showSourceSubFolders() - && sourcesOrHeadersFolder(td.sourceGroups[si.sourceGroup]); + && defaultCMakeSourceGroupFolder(td.sourceGroups[si.sourceGroup]); // Where does the file node need to go? if (showSourceFolders && sourcePath.isChildOf(buildDirectory) && !inSourceBuild) { @@ -699,7 +699,7 @@ static void addCompileGroups(ProjectNode *targetRoot, for (size_t i = 0; i < sourceGroupFileNodes.size(); ++i) { const bool showSourceFolders = settings().showSourceSubFolders() - && sourcesOrHeadersFolder(td.sourceGroups[i]); + && defaultCMakeSourceGroupFolder(td.sourceGroups[i]); std::vector> ¤t = sourceGroupFileNodes[i]; FolderNode *insertNode = td.sourceGroups[i] == "TREE" diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp index d23f6a4f972..c25cc69378f 100644 --- a/src/plugins/cmakeprojectmanager/projecttreehelper.cpp +++ b/src/plugins/cmakeprojectmanager/projecttreehelper.cpp @@ -18,9 +18,12 @@ using namespace ProjectExplorer; namespace CMakeProjectManager::Internal { -bool sourcesOrHeadersFolder(const QString &displayName) +bool defaultCMakeSourceGroupFolder(const QString &displayName) { - return displayName == "Source Files" || displayName == "Header Files"; + return displayName == "Source Files" || displayName == "Header Files" + || displayName == "Resources" || displayName == "" + || displayName == "Precompile Header File" || displayName == "CMake Rules" + || displayName == "Object Files"; } std::unique_ptr createCMakeVFolder(const Utils::FilePath &basePath, @@ -30,7 +33,7 @@ std::unique_ptr createCMakeVFolder(const Utils::FilePath &basePath, auto newFolder = std::make_unique(basePath); newFolder->setPriority(priority); newFolder->setDisplayName(displayName); - newFolder->setIsSourcesOrHeaders(sourcesOrHeadersFolder(displayName)); + newFolder->setIsSourcesOrHeaders(defaultCMakeSourceGroupFolder(displayName)); return newFolder; } diff --git a/src/plugins/cmakeprojectmanager/projecttreehelper.h b/src/plugins/cmakeprojectmanager/projecttreehelper.h index 258e0a63231..35f7cf16a43 100644 --- a/src/plugins/cmakeprojectmanager/projecttreehelper.h +++ b/src/plugins/cmakeprojectmanager/projecttreehelper.h @@ -11,7 +11,7 @@ namespace CMakeProjectManager::Internal { -bool sourcesOrHeadersFolder(const QString &displayName); +bool defaultCMakeSourceGroupFolder(const QString &displayName); std::unique_ptr createCMakeVFolder(const Utils::FilePath &basePath, int priority,