Skip to content

Commit 4ab6ab1

Browse files
committed
allow changing the dbus config file name
on some distributions the generic name of the dbus config might be provided by more than one display manager, so always installing with the generic name would require distributions to hard-patch the cmake code. allowing to change it through a cmake cache variable enables distributions to simply parameterize in their cmake call. this for example affects Ubuntu where the config would be provided by both SDDM and LightDM.
1 parent 78fd193 commit 4ab6ab1

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession"
141141

142142
set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file")
143143
set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log" CACHE PATH "Path of the sddm log file")
144+
set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the sddm config file")
144145
set(COMPONENTS_TRANSLATION_DIR "${DATA_INSTALL_DIR}/translations" CACHE PATH "Components translations directory")
145146

146147
# Add subdirectories

data/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
22
install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")
33

4-
install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}")
4+
install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME})
55

66
install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts"
77
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE

0 commit comments

Comments
 (0)