diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,8 @@ set(SDDM_CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf" CACHE PATH "Path of the sddm config file") set(SDDM_CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d" CACHE PATH "Path of the sddm config directory") set(SDDM_SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d" CACHE PATH "Path of the system sddm config directory") +set(XSESSIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/xsessions" CACHE PATH "Path of the xsessions") +set(WAYLAND_SESSIONS_DIR "${CMAKE_INSTALL_PREFIX}/share/wayland-sessions" CACHE PATH "Path of the wayland sessions") configure_file(config.h.in config.h IMMEDIATE @ONLY) # add_subdirectory(configwidgets) diff --git a/src/config.h.in b/src/config.h.in --- a/src/config.h.in +++ b/src/config.h.in @@ -4,5 +4,7 @@ #define SDDM_CONFIG_FILE "@SDDM_CONFIG_FILE@" #define SDDM_CONFIG_DIR "@SDDM_CONFIG_DIR@" #define SDDM_SYSTEM_CONFIG_DIR "@SDDM_SYSTEM_CONFIG_DIR@" +#define XSESSIONS_DIR "@XSESSIONS_DIR@" +#define WAYLAND_SESSIONS_DIR "@WAYLAND_SESSIONS_DIR@" #endif //CONFIG_H diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp --- a/src/sessionmodel.cpp +++ b/src/sessionmodel.cpp @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ***************************************************************************/ +#include "config.h" #include "sessionmodel.h" #include @@ -46,8 +47,8 @@ }; SessionModel::SessionModel(QObject *parent) : QAbstractListModel(parent), d(new SessionModelPrivate()) { - loadDir(QStringLiteral("/usr/share/xsessions"), SessionTypeX); - loadDir(QStringLiteral("/usr/share/wayland-sessions"), SessionTypeWayland); + loadDir(QStringLiteral(XSESSIONS_DIR), SessionTypeX); + loadDir(QStringLiteral(WAYLAND_SESSIONS_DIR), SessionTypeWayland); } SessionModel::~SessionModel() {