Commit 01539622 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Fix coinstallability of breezecommon lib

Install the Qt6 version with 6 suffix, otherwise things clash
parent 453b59e9
Pipeline #363071 passed with stage
in 6 minutes and 12 seconds
......@@ -61,7 +61,7 @@ set_target_properties(breezedecoration PROPERTIES
target_link_libraries(breezedecoration
PRIVATE
breezecommon5
breezecommon
breezedecoration_STATIC
KF6::CoreAddons
KF6::ConfigWidgets
......
kcoreaddons_add_plugin(kcm_breezedecoration SOURCES kcm_breezedecoration.cpp INSTALL_NAMESPACE "plasma/kcms/breeze")
target_include_directories(kcm_breezedecoration PRIVATE ${CMAKE_SOURCE_DIR}/kdecoration ${CMAKE_BINARY_DIR}/kdecoration/)
target_link_libraries(kcm_breezedecoration breezecommon5 breezedecoration_STATIC KF6::I18n KF6::CoreAddons KF6::ConfigWidgets KF6::KCMUtils Qt::DBus)
target_link_libraries(kcm_breezedecoration breezecommon breezedecoration_STATIC KF6::I18n KF6::CoreAddons KF6::ConfigWidgets KF6::KCMUtils Qt::DBus)
kcmutils_generate_desktop_file(kcm_breezedecoration)
......@@ -101,7 +101,7 @@ elseif (TARGET Qt6::Gui)
target_link_libraries(breeze Qt6::GuiPrivate)
endif()
target_link_libraries(breeze KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::GuiAddons KF${QT_MAJOR_VERSION}::IconThemes KF${QT_MAJOR_VERSION}::WindowSystem)
target_link_libraries(breeze breezecommon5)
target_link_libraries(breeze breezecommon)
if(KF${QT_MAJOR_VERSION}FrameworkIntegration_FOUND)
target_link_libraries(breeze KF${QT_MAJOR_VERSION}::Style)
......
......@@ -7,19 +7,20 @@ set(breezecommon_LIB_SRCS
breezeboxshadowrenderer.cpp
)
add_library(breezecommon5 ${breezecommon_LIB_SRCS})
add_library(breezecommon ${breezecommon_LIB_SRCS})
generate_export_header(breezecommon5
generate_export_header(breezecommon
BASE_NAME breezecommon
EXPORT_FILE_NAME breezecommon_export.h)
target_link_libraries(breezecommon5
target_link_libraries(breezecommon
PUBLIC
Qt::Core
Qt::Gui)
set_target_properties(breezecommon5 PROPERTIES
set_target_properties(breezecommon PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR})
SOVERSION ${PROJECT_VERSION_MAJOR}
OUTPUT_NAME breezecommon${QT_MAJOR_VERSION})
install(TARGETS breezecommon5 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(TARGETS breezecommon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
Supports Markdown
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