Qt6 build system fixes

Two recent changes and one issue initially missed.
wilder-5.25
Volker Krause 4 years ago
parent 241c6976c3
commit 34857ed1ec
  1. 4
      kcms/colors/CMakeLists.txt
  2. 2
      libkworkspace/LibKWorkspaceConfig.cmake.in

@ -9,7 +9,7 @@ set(kcm_colors_SRCS
filterproxymodel.cpp filterproxymodel.cpp
) )
qt5_generate_dbus_interface( qt_generate_dbus_interface(
accentColorService/accentColorService.h accentColorService/accentColorService.h
org.kde.plasmashell.accentColor.xml org.kde.plasmashell.accentColor.xml
OPTIONS -M OPTIONS -M
@ -29,7 +29,7 @@ set(plasma-accentcolor-service_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml
) )
qt5_add_dbus_adaptor(plasma-accentcolor-service_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml qt_add_dbus_adaptor(plasma-accentcolor-service_SRCS ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.accentColor.xml
accentColorService/accentColorService.h AccentColorService accentColorService/accentColorService.h AccentColorService
accentcolor_service_adaptor AccentColorServiceAdaptor) accentcolor_service_adaptor AccentColorServiceAdaptor)

@ -1,6 +1,6 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
find_dependency(Qt5Core "@QT_MIN_VERSION@") find_dependency(Qt@QT_MAJOR_VERSION@Core "@QT_MIN_VERSION@")
include("${CMAKE_CURRENT_LIST_DIR}/LibKWorkspaceLibraryTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/LibKWorkspaceLibraryTargets.cmake")

Loading…
Cancel
Save