mirror of
https://invent.kde.org/graphics/okular
synced 2024-06-30 22:54:24 +00:00
Replace Okular5 with Okular6 in cmake config
Install Okular6 target, required for Kile qt6 port
This commit is contained in:
parent
5fb88dfb86
commit
422fbdc1b7
|
@ -100,7 +100,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
ecm_setup_version(${PROJECT_VERSION}
|
ecm_setup_version(${PROJECT_VERSION}
|
||||||
VARIABLE_PREFIX OKULAR
|
VARIABLE_PREFIX OKULAR
|
||||||
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/core/version.h"
|
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)
|
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)
|
target_link_libraries(okularcore PRIVATE Qt6::Qml)
|
||||||
endif()
|
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.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
|
||||||
install(FILES conf/okular_core.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
|
install(FILES conf/okular_core.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
|
||||||
|
@ -642,22 +642,22 @@ endif()
|
||||||
|
|
||||||
########### cmake files #################
|
########### cmake files #################
|
||||||
|
|
||||||
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Okular5")
|
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Okular6")
|
||||||
configure_package_config_file(
|
configure_package_config_file(
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Okular5Config.cmake.in"
|
"${CMAKE_CURRENT_SOURCE_DIR}/Okular6Config.cmake.in"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/Okular6Config.cmake"
|
||||||
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
||||||
PATH_VARS KDE_INSTALL_INCLUDEDIR CMAKE_INSTALL_PREFIX
|
PATH_VARS KDE_INSTALL_INCLUDEDIR CMAKE_INSTALL_PREFIX
|
||||||
)
|
)
|
||||||
|
|
||||||
install(FILES
|
install(FILES
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Okular5Config.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/Okular6Config.cmake"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/Okular5ConfigVersion.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/Okular6ConfigVersion.cmake"
|
||||||
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
|
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
|
||||||
COMPONENT Devel
|
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
|
install(FILES
|
||||||
core/stamps.svg
|
core/stamps.svg
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
include(CMakeFindDependencyMacro)
|
include(CMakeFindDependencyMacro)
|
||||||
|
|
||||||
find_dependency(Qt5Core @QT_REQUIRED_VERSION@)
|
find_dependency(Qt6Core @QT_REQUIRED_VERSION@)
|
||||||
find_dependency(Qt5PrintSupport @QT_REQUIRED_VERSION@)
|
find_dependency(Qt6PrintSupport @QT_REQUIRED_VERSION@)
|
||||||
find_dependency(Qt5Widgets @QT_REQUIRED_VERSION@)
|
find_dependency(Qt6Widgets @QT_REQUIRED_VERSION@)
|
||||||
find_dependency(KF6CoreAddons @KF6_REQUIRED_VERSION@)
|
find_dependency(KF6CoreAddons @KF6_REQUIRED_VERSION@)
|
||||||
find_dependency(KF6Config @KF6_REQUIRED_VERSION@)
|
find_dependency(KF6Config @KF6_REQUIRED_VERSION@)
|
||||||
find_dependency(KF6XmlGui @KF6_REQUIRED_VERSION@)
|
find_dependency(KF6XmlGui @KF6_REQUIRED_VERSION@)
|
||||||
|
|
||||||
@PACKAGE_SETUP_AUTOMOC_VARIABLES@
|
@PACKAGE_SETUP_AUTOMOC_VARIABLES@
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/Okular5Targets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/Okular6Targets.cmake")
|
Loading…
Reference in New Issue
Block a user