Commit 4c4f76d5 authored by Stefan Brüns's avatar Stefan Brüns
Browse files

[kio/archive] Fix ecm_declare_logging_category usage

The generated source file is required by two targets, so using the
ECM 5.80 target syntax is misleading.

Also remove kio_archive_debug.h from the repository in favor of the
generated one.
parent bd822df3
......@@ -40,9 +40,15 @@ install(FILES
COMPONENT Devel
)
ecm_qt_declare_logging_category(kio_archive_debug_SRCS
HEADER kio_archive_debug.h
IDENTIFIER KIO_ARCHIVE_LOG
CATEGORY_NAME log_kio_archive
)
############### ArchiveProtocolBase library ###########
add_library(kioarchive kio_archivebase.cpp kio_archive_debug.cpp)
add_library(kioarchive kio_archivebase.cpp ${kio_archive_debug_SRCS})
include(GenerateExportHeader)
generate_export_header(kioarchive BASE_NAME libkioarchive EXPORT_FILE_NAME libkioarchive_export.h)
......@@ -63,16 +69,11 @@ set_target_properties(kioarchive PROPERTIES
EXPORT_NAME KioArchive
)
ecm_qt_declare_logging_category(kioarchive
HEADER kio_archive_debug.h
IDENTIFIER KIO_ARCHIVE_LOG
CATEGORY_NAME log_kio_archive)
install(TARGETS kioarchive EXPORT KioArchiveTargets LIBRARY NAMELINK_SKIP ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
############### Archive KIOslave ######################
add_library(kio_archive MODULE kio_archive.cpp kio_archive_debug.cpp)
add_library(kio_archive MODULE kio_archive.cpp ${kio_archive_debug_SRCS})
target_link_libraries(kio_archive KF5::KIOCore KF5::Archive kioarchive Qt5::Network)
set_target_properties(kio_archive PROPERTIES OUTPUT_NAME "archive")
install(TARGETS kio_archive DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
/* This file is part of the KDE project
SPDX-FileCopyrightText: 2014 Laurent Montel <montel@kde.org>
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef KIO_ARCHIVE_DEBUG_H
#define KIO_ARCHIVE_DEBUG_H
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(KIO_ARCHIVE_LOG)
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment