Changeset View
Changeset View
Standalone View
Standalone View
ksmserver/CMakeLists.txt
1 | add_definitions(-DTRANSLATION_DOMAIN=\"ksmserver\") | 1 | add_definitions(-DTRANSLATION_DOMAIN=\"ksmserver\") | ||
---|---|---|---|---|---|
2 | 2 | | |||
3 | include_directories(${PHONON_INCLUDE_DIR}) | 3 | include_directories(${PHONON_INCLUDE_DIR}) | ||
4 | 4 | | |||
5 | check_library_exists(ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN) | 5 | check_library_exists(ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN) | ||
6 | configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmserver.h) | 6 | configure_file(config-ksmserver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksmserver.h) | ||
7 | 7 | | |||
8 | add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") | 8 | add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") | ||
9 | add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) | 9 | add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) | ||
10 | add_definitions(-DQT_NO_URL_CAST_FROM_STRING) | 10 | add_definitions(-DQT_NO_URL_CAST_FROM_STRING) | ||
11 | 11 | | |||
12 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | 12 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | ||
13 | add_subdirectory(logout-greeter) | 13 | add_subdirectory(logout-greeter) | ||
14 | add_subdirectory(switchuser-greeter) | | |||
15 | if(BUILD_TESTING) | 14 | if(BUILD_TESTING) | ||
16 | add_subdirectory(tests) | 15 | add_subdirectory(tests) | ||
17 | endif() | 16 | endif() | ||
18 | 17 | | |||
19 | ########### next target ############### | 18 | ########### next target ############### | ||
20 | 19 | | |||
21 | set(ksmserver_KDEINIT_SRCS | 20 | set(ksmserver_KDEINIT_SRCS | ||
22 | main.cpp | 21 | main.cpp | ||
Show All 17 Lines | |||||
40 | # # This is actually now disabled, because OrgKDEKlauncherInterface is also provided | 39 | # # This is actually now disabled, because OrgKDEKlauncherInterface is also provided | ||
41 | # # by kdecore, it is not autogenerated and is not binary compatible with a currently | 40 | # # by kdecore, it is not autogenerated and is not binary compatible with a currently | ||
42 | # # generated version, thus at certain circumstances leading to strange crashes. | 41 | # # generated version, thus at certain circumstances leading to strange crashes. | ||
43 | # # This should be fixed for KDE5. | 42 | # # This should be fixed for KDE5. | ||
44 | # # KLauchner.xml is installed by kdelibs, so it is in KDE4_DBUS_INTERFACES_DIR | 43 | # # KLauchner.xml is installed by kdelibs, so it is in KDE4_DBUS_INTERFACES_DIR | ||
45 | set(klauncher_xml ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml) | 44 | set(klauncher_xml ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml) | ||
46 | qt5_add_dbus_interface( ksmserver_KDEINIT_SRCS ${klauncher_xml} klauncher_interface ) | 45 | qt5_add_dbus_interface( ksmserver_KDEINIT_SRCS ${klauncher_xml} klauncher_interface ) | ||
47 | 46 | | |||
47 | qt5_add_dbus_interface( ksmserver_KDEINIT_SRCS ${KDE_INSTALL_FULL_DBUSINTERFACEDIR}/org.kde.screensaver.xml kscreenlocker_interface ) | ||||
bruns: This breaks in two ways:
- There is no specified dependency on KScreenlocker 5.13.80
- One… | |||||
48 | | ||||
49 | | ||||
48 | qt5_add_dbus_adaptor( ksmserver_KDEINIT_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) | 50 | qt5_add_dbus_adaptor( ksmserver_KDEINIT_SRCS org.kde.KSMServerInterface.xml server.h KSMServer ) | ||
49 | 51 | | |||
50 | kf5_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS}) | 52 | kf5_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS}) | ||
51 | 53 | | |||
52 | set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KSMServerDBusInterface") | 54 | set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KSMServerDBusInterface") | ||
53 | 55 | | |||
54 | configure_package_config_file(KSMServerDBusInterfaceConfig.cmake.in | 56 | configure_package_config_file(KSMServerDBusInterfaceConfig.cmake.in | ||
55 | ${CMAKE_CURRENT_BINARY_DIR}/KSMServerDBusInterfaceConfig.cmake | 57 | ${CMAKE_CURRENT_BINARY_DIR}/KSMServerDBusInterfaceConfig.cmake | ||
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines |
This breaks in two ways:
The latter needs something like `set(KSCREENLOCKER_DBUS_INTERFACES_DIR "${PACKAGE_PREFIX_DIR}/share/dbus-1/interfaces")
` in KScreenLockerConfig.cmake
This is done by several other components which install DBUS interfaces (Solid, KWallet, Baloo, KNotifications).