From 4a109eefb85214763f2e432908ec23d62952749d Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 14 Jul 2023 02:42:04 +0200 Subject: [PATCH] Add Plasmoid files not used in current build to excluded files So these files are still considered for tidying and translations --- plasmoid/CMakeLists.txt | 45 ++++++++++++++++++++----------------- plasmoid/lib/CMakeLists.txt | 3 +++ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt index da4684f..5554dff 100644 --- a/plasmoid/CMakeLists.txt +++ b/plasmoid/CMakeLists.txt @@ -15,28 +15,33 @@ set(META_SRCDIR_REFS "${CMAKE_CURRENT_SOURCE_DIR}\n${CMAKE_CURRENT_SOURCE_DIR}/. find_package(${KF_PACKAGE_PREFIX}Plasma REQUIRED) # define list of QML files; there is a distinct directory for each major Plasma version +set(PLASMOID_FILE_NAMES + CompactRepresentation.qml + FullRepresentation.qml + DirectoriesPage.qml + DevicesPage.qml + DownloadsPage.qml + RecentChangesPage.qml + TopLevelView.qml + TopLevelItem.qml + DetailView.qml + DetailItem.qml + TabButton.qml + ToolTipTrigger.qml + ToolTipView.qml + ToolBar.qml + ToolButton.qml + TinyButton.qml + IconLabel.qml + StatisticsView.qml + main.qml) set(PLASMOID_FILES_BASE "package${KF_MAJOR_VERSION}") set(PLASMOID_FILES_UI "${PLASMOID_FILES_BASE}/contents/ui") -set(PLASMOID_FILES - ${PLASMOID_FILES_UI}/CompactRepresentation.qml - ${PLASMOID_FILES_UI}/FullRepresentation.qml - ${PLASMOID_FILES_UI}/DirectoriesPage.qml - ${PLASMOID_FILES_UI}/DevicesPage.qml - ${PLASMOID_FILES_UI}/DownloadsPage.qml - ${PLASMOID_FILES_UI}/RecentChangesPage.qml - ${PLASMOID_FILES_UI}/TopLevelView.qml - ${PLASMOID_FILES_UI}/TopLevelItem.qml - ${PLASMOID_FILES_UI}/DetailView.qml - ${PLASMOID_FILES_UI}/DetailItem.qml - ${PLASMOID_FILES_UI}/TabButton.qml - ${PLASMOID_FILES_UI}/ToolTipTrigger.qml - ${PLASMOID_FILES_UI}/ToolTipView.qml - ${PLASMOID_FILES_UI}/ToolBar.qml - ${PLASMOID_FILES_UI}/ToolButton.qml - ${PLASMOID_FILES_UI}/TinyButton.qml - ${PLASMOID_FILES_UI}/IconLabel.qml - ${PLASMOID_FILES_UI}/StatisticsView.qml - ${PLASMOID_FILES_UI}/main.qml) +foreach (PLASMOID_FILE_NAME ${PLASMOID_FILE_NAMES}) + list(APPEND PLASMOID_FILES "${PLASMOID_FILES_UI}/${PLASMOID_FILE_NAME}") +endforeach () +file(GLOB_RECURSE PLASMOID_EXCLUDED_FILES LIST_DIRECTORIES false RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "package*/*.qml") +list(REMOVE_ITEM PLASMOID_EXCLUDED_FILES ${PLASMOID_FILES}) # find ECM (required by Plasma) find_package(ECM REQUIRED NO_MODULE) diff --git a/plasmoid/lib/CMakeLists.txt b/plasmoid/lib/CMakeLists.txt index 1b48f84..1c6654a 100644 --- a/plasmoid/lib/CMakeLists.txt +++ b/plasmoid/lib/CMakeLists.txt @@ -5,6 +5,9 @@ set(WIDGETS_UI_FILES appearanceoptionpage.ui) foreach (PLASMOID_FILE ${PLASMOID_FILES}) list(APPEND QML_SRC_FILES "../${PLASMOID_FILE}") endforeach () +foreach (PLASMOID_FILE ${PLASMOID_EXCLUDED_FILES}) + list(APPEND EXCLUDED_FILES "../${PLASMOID_FILE}") +endforeach () set(TS_FILES ../translations/${META_PROJECT_NAME}_de_DE.ts ../translations/${META_PROJECT_NAME}_en_US.ts) # find qtutilities