Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KItinerary
Commits
34d03bb0
Commit
34d03bb0
authored
Sep 08, 2021
by
Volker Krause
Browse files
Move to auto-generating the logging categories file
Not really less code, but does the right thing on Android by default.
parent
5d5aaedf
Pipeline
#79474
passed with stage
in 14 minutes and 20 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
34d03bb0
...
...
@@ -144,7 +144,6 @@ install(EXPORT KPimItineraryTargets
FILE KPimItineraryTargets.cmake
NAMESPACE KPim::
)
install
(
FILES org_kde_kitinerary.categories DESTINATION
${
KDE_INSTALL_LOGGINGCATEGORIESDIR
}
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/kitinerary_version.h
DESTINATION
${
KDE_INSTALL_INCLUDEDIR_PIM
}
COMPONENT Devel
)
...
...
org_kde_kitinerary.categories
deleted
100644 → 0
View file @
5d5aaedf
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
org.kde.kitinerary KItinerary IDENTIFIER [KItinerary::Log]
org.kde.kitinerary.comparator KItinerary Comparison/Merging Logging IDENTIFIER [KItinerary::CompareLog]
org.kde.kitinerary.extractorValidator KItinerary Extractor Validator Logging IDENTIFIER [KItinerary::ValidatorLog]
src/lib/CMakeLists.txt
View file @
34d03bb0
...
...
@@ -127,9 +127,27 @@ target_sources(KPimItinerary PRIVATE
stringutil.cpp
)
kde_source_files_enable_exceptions
(
barcodedecoder.cpp qimagepurebinarizer.cpp
)
ecm_qt_declare_logging_category
(
KPimItinerary HEADER logging.h IDENTIFIER KItinerary::Log CATEGORY_NAME org.kde.kitinerary
)
ecm_qt_declare_logging_category
(
KPimItinerary HEADER compare-logging.h IDENTIFIER KItinerary::CompareLog CATEGORY_NAME org.kde.kitinerary.comparator
)
ecm_qt_declare_logging_category
(
KPimItinerary HEADER validator-logging.h IDENTIFIER KItinerary::ValidatorLog CATEGORY_NAME org.kde.kitinerary.extractorValidator
)
ecm_qt_declare_logging_category
(
KPimItinerary
HEADER logging.h
IDENTIFIER KItinerary::Log
CATEGORY_NAME org.kde.kitinerary
DESCRIPTION
"KItinerary"
EXPORT KITINERARY
)
ecm_qt_declare_logging_category
(
KPimItinerary
HEADER compare-logging.h
IDENTIFIER KItinerary::CompareLog
CATEGORY_NAME org.kde.kitinerary.comparator
DESCRIPTION
"KItinerary Comparison/Merging Logging"
EXPORT KITINERARY
)
ecm_qt_declare_logging_category
(
KPimItinerary
HEADER validator-logging.h
IDENTIFIER KItinerary::ValidatorLog
CATEGORY_NAME org.kde.kitinerary.extractorValidator
DESCRIPTION
"KItinerary Extractor Validator Logging"
EXPORT KITINERARY
)
generate_export_header
(
KPimItinerary BASE_NAME KItinerary
)
set_target_properties
(
KPimItinerary PROPERTIES
...
...
@@ -334,6 +352,11 @@ if (NOT ANDROID)
install
(
FILES application-vnd-kde-itinerary.xml DESTINATION
${
KDE_INSTALL_MIMEDIR
}
)
update_xdg_mimetypes
(
${
KDE_INSTALL_MIMEDIR
}
)
endif
()
ecm_qt_install_logging_categories
(
EXPORT KITINERARY
FILE org_kde_kitinerary.categories
DESTINATION
${
KDE_INSTALL_LOGGINGCATEGORIESDIR
}
)
if
(
BUILD_QCH
)
ecm_add_qch
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment