From 422fbdc1b743bd98b5f3d16b35c725f7405ffac6 Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Fri, 15 Dec 2023 15:54:51 +0100 Subject: [PATCH] Replace Okular5 with Okular6 in cmake config Install Okular6 target, required for Kile qt6 port --- CMakeLists.txt | 18 +++++++++--------- ...r5Config.cmake.in => Okular6Config.cmake.in | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) rename Okular5Config.cmake.in => Okular6Config.cmake.in (53%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 710f7933b..94416b648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX OKULAR VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake") + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Okular6ConfigVersion.cmake") find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Widgets PrintSupport Svg Xml) @@ -495,9 +495,9 @@ if (TARGET Qt6::Qml) target_link_libraries(okularcore PRIVATE Qt6::Qml) endif() -set_target_properties(okularcore PROPERTIES VERSION 11.0.0 SOVERSION 11 OUTPUT_NAME Okular5Core EXPORT_NAME Core) +set_target_properties(okularcore PROPERTIES VERSION 11.0.0 SOVERSION 11 OUTPUT_NAME Okular6Core EXPORT_NAME Core) -install(TARGETS okularcore EXPORT Okular5Targets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS okularcore EXPORT Okular6Targets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES conf/okular.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) install(FILES conf/okular_core.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) @@ -642,22 +642,22 @@ endif() ########### cmake files ################# -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Okular5") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Okular6") configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/Okular5Config.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/Okular6Config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Okular6Config.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} PATH_VARS KDE_INSTALL_INCLUDEDIR CMAKE_INSTALL_PREFIX ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/Okular6Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/Okular6ConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(EXPORT Okular5Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE Okular5Targets.cmake NAMESPACE Okular::) +install(EXPORT Okular6Targets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE Okular6Targets.cmake NAMESPACE Okular::) install(FILES core/stamps.svg diff --git a/Okular5Config.cmake.in b/Okular6Config.cmake.in similarity index 53% rename from Okular5Config.cmake.in rename to Okular6Config.cmake.in index e4e7a64d1..df272ef59 100644 --- a/Okular5Config.cmake.in +++ b/Okular6Config.cmake.in @@ -2,13 +2,13 @@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @QT_REQUIRED_VERSION@) -find_dependency(Qt5PrintSupport @QT_REQUIRED_VERSION@) -find_dependency(Qt5Widgets @QT_REQUIRED_VERSION@) +find_dependency(Qt6Core @QT_REQUIRED_VERSION@) +find_dependency(Qt6PrintSupport @QT_REQUIRED_VERSION@) +find_dependency(Qt6Widgets @QT_REQUIRED_VERSION@) find_dependency(KF6CoreAddons @KF6_REQUIRED_VERSION@) find_dependency(KF6Config @KF6_REQUIRED_VERSION@) find_dependency(KF6XmlGui @KF6_REQUIRED_VERSION@) @PACKAGE_SETUP_AUTOMOC_VARIABLES@ -include("${CMAKE_CURRENT_LIST_DIR}/Okular5Targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/Okular6Targets.cmake")