diff --git a/archive/CMakeLists.txt b/archive/CMakeLists.txt --- a/archive/CMakeLists.txt +++ b/archive/CMakeLists.txt @@ -8,28 +8,27 @@ 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}/KF5KioArchiveConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfigVersion.cmake" SOVERSION ${LIBKIOARCHIVE_SOVERSION}) -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KioArchive") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KioArchive") ecm_configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5KioArchiveConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KioArchiveConfig.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/KioArchiveConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5KioArchiveConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KioArchiveConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KioArchiveConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT KF5KioArchiveTargets +install(EXPORT KioArchiveTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5KioArchiveTargets.cmake - NAMESPACE KF5:: + FILE KioArchiveTargets.cmake ) install(FILES @@ -41,12 +40,12 @@ ############### ArchiveProtocolBase library ########### -add_library(KF5KioArchive kio_archivebase.cpp kio_archive_debug.cpp) +add_library(kioarchive kio_archivebase.cpp kio_archive_debug.cpp) include(GenerateExportHeader) -generate_export_header(KF5KioArchive BASE_NAME libkioarchive EXPORT_FILE_NAME libkioarchive_export.h) +generate_export_header(kioarchive BASE_NAME libkioarchive EXPORT_FILE_NAME libkioarchive_export.h) -target_link_libraries(KF5KioArchive +target_link_libraries(kioarchive PUBLIC KF5::Archive KF5::KIOCore @@ -55,18 +54,18 @@ KF5::I18n ) -set_target_properties(KF5KioArchive PROPERTIES +set_target_properties(kioarchive PROPERTIES VERSION ${KIOARCHIVE_VERSION_STRING} SOVERSION ${KIOARCHIVE_SOVERSION} EXPORT_NAME KioArchive ) -install(TARGETS KF5KioArchive EXPORT KF5KioArchiveTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kioarchive EXPORT KioArchiveTargets ${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 KF5KioArchive) +target_link_libraries(kio_archive KF5::KIOCore KF5::Archive kioarchive) set_target_properties(kio_archive PROPERTIES OUTPUT_NAME "archive") install(TARGETS kio_archive DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio) install(FILES tar.protocol ar.protocol zip.protocol DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/archive/KF5KioArchiveConfig.cmake.in b/archive/KF5KioArchiveConfig.cmake.in deleted file mode 100644 --- a/archive/KF5KioArchiveConfig.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -@PACKAGE_INIT@ - -find_dependency(KF5KIO) - -include("${CMAKE_CURRENT_LIST_DIR}/KF5KioArchiveTargets.cmake") diff --git a/archive/KioArchiveConfig.cmake.in b/archive/KioArchiveConfig.cmake.in new file mode 100644 --- /dev/null +++ b/archive/KioArchiveConfig.cmake.in @@ -0,0 +1,6 @@ +@PACKAGE_INIT@ + +find_dependency(KF5KIO) +find_dependency(KF5KDELibs4Support) + +include("${CMAKE_CURRENT_LIST_DIR}/KioArchiveTargets.cmake")