diff --git a/archive/CMakeLists.txt b/archive/CMakeLists.txt index 5b9eb026..73d09070 100644 --- a/archive/CMakeLists.txt +++ b/archive/CMakeLists.txt @@ -1,73 +1,78 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_archive\") if(BUILD_TESTING) add_subdirectory(autotests) endif() set(LIBKIOARCHIVE_VERSION "5.97.0") set(LIBKIOARCHIVE_SOVERSION "5") include(ECMSetupVersion) ecm_setup_version(${LIBKIOARCHIVE_VERSION} VARIABLE_PREFIX "KIOARCHIVE" VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kioarchive_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfigVersion.cmake" SOVERSION ${LIBKIOARCHIVE_SOVERSION}) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KioArchive") configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KioArchiveConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT KioArchiveTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KioArchiveTargets.cmake ) install(FILES kio_archivebase.h ${CMAKE_CURRENT_BINARY_DIR}/libkioarchive_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) ############### ArchiveProtocolBase library ########### add_library(kioarchive kio_archivebase.cpp kio_archive_debug.cpp) include(GenerateExportHeader) generate_export_header(kioarchive BASE_NAME libkioarchive EXPORT_FILE_NAME libkioarchive_export.h) target_link_libraries(kioarchive PUBLIC KF5::Archive KF5::KIOCore PRIVATE KF5::I18n Qt5::Network Qt5::DBus ) set_target_properties(kioarchive PROPERTIES VERSION ${KIOARCHIVE_VERSION_STRING} SOVERSION ${KIOARCHIVE_SOVERSION} 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) 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) diff --git a/archive/kio_archive_debug.cpp b/archive/kio_archive_debug.cpp deleted file mode 100644 index 01f7131d..00000000 --- a/archive/kio_archive_debug.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2014 Laurent Montel - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "kio_archive_debug.h" -Q_LOGGING_CATEGORY(KIO_ARCHIVE_LOG, "log_kio_archive") - -