Skip to content

Commit

Permalink
allow changing the dbus config file name
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
hsitter committed Apr 14, 2015
1 parent 78fd193 commit 4ab6ab1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -141,6 +141,7 @@ set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession"

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

# Add subdirectories
Expand Down
2 changes: 1 addition & 1 deletion data/CMakeLists.txt
@@ -1,7 +1,7 @@
install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}")
install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}")

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

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

0 comments on commit 4ab6ab1

Please sign in to comment.