alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ecm_qt_install_logging_categories over manual categories file

Browse Source
This commit is contained in:
Friedrich W. H. Kossebau 2020-02-12 04:09:12 +01:00
parent 9d27675c3b
commit 2e3cc7e8dd
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -225,6 +225,4 @@ install(EXPORT KF5PlasmaTargets
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
install(FILES plasma-framework.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

2
plasma-framework.categories
View File

@ -1,2 +0,0 @@
org.kde.plasma Plasma Core lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [LOG_PLASMA]
org.kde.plasma Plasma Quick lib DEFAULT_SEVERITY [WARNING] IDENTIFIER [LOG_PLASMAQUICK]

6
src/CMakeLists.txt
View File

@ -4,3 +4,9 @@ add_subdirectory(declarativeimports)
add_subdirectory(plasmapkg) add_subdirectory(plasmapkg)
add_subdirectory(scriptengines) add_subdirectory(scriptengines)
add_subdirectory(plasmaquick) add_subdirectory(plasmaquick)
ecm_qt_install_logging_categories(
EXPORT PLASMA
FILE plasma-framework.categories
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)

8
src/plasma/CMakeLists.txt
View File

@ -83,7 +83,13 @@ kconfig_add_kcfg_files(Plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcf
# TEST_INCLUDES # TEST_INCLUDES
#) #)
ecm_qt_declare_logging_category(Plasma_LIB_SRCS HEADER debug_p.h IDENTIFIER LOG_PLASMA CATEGORY_NAME org.kde.plasma) ecm_qt_declare_logging_category(Plasma_LIB_SRCS
HEADER debug_p.h
IDENTIFIER LOG_PLASMA
CATEGORY_NAME org.kde.plasma
DESCRIPTION "Plasma Core lib"
EXPORT PLASMA
)
add_library(KF5Plasma ${Plasma_LIB_SRCS}) add_library(KF5Plasma ${Plasma_LIB_SRCS})
add_library(KF5::Plasma ALIAS KF5Plasma) add_library(KF5::Plasma ALIAS KF5Plasma)

8
src/plasmaquick/CMakeLists.txt
View File

@ -25,7 +25,13 @@ if(HAVE_KWAYLAND)
set(plasmaquick_LIB_SRC ${plasmaquick_LIB_SRC} waylandintegration.cpp) set(plasmaquick_LIB_SRC ${plasmaquick_LIB_SRC} waylandintegration.cpp)
endif() endif()
ecm_qt_declare_logging_category(PlasmaQuick_LIB_SRCS HEADER debug_p.h IDENTIFIER LOG_PLASMAQUICK CATEGORY_NAME org.kde.plasmaquick) ecm_qt_declare_logging_category(PlasmaQuick_LIB_SRCS
HEADER debug_p.h
IDENTIFIER LOG_PLASMAQUICK
CATEGORY_NAME org.kde.plasmaquick
DESCRIPTION "Plasma Quick lib"
EXPORT PLASMA
)
add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC}) add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC})
add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick) add_library(KF5::PlasmaQuick ALIAS KF5PlasmaQuick)