Revert "login-sessions: Set the correct filename depending on default session type"

This reverts commit b93a06395e.
wilder-5.22
Gustavo Carneiro 5 years ago
parent 8b4cf5a197
commit a6b2891186
  1. 1
      CMakeLists.txt
  2. 16
      login-sessions/CMakeLists.txt

@ -193,7 +193,6 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
query_qmake(QtBinariesDir QT_INSTALL_BINS)
option(PLASMA_SYSTEMD_BOOT "Use systemd units for startup of plasma (WIP)" FALSE)
option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE)
add_subdirectory(doc)
add_subdirectory(libkworkspace)

@ -1,22 +1,14 @@
## For Plasma end users
if(PLASMA_WAYLAND_DEFAULT_SESSION)
set(PLASMA_X11_DESKTOP_FILENAME plasmax11.desktop CACHE INTERNAL)
set(PLASMA_WAYLAND_DESKTOP_FILENAME plasma.desktop CACHE INTERNAL)
else()
set(PLASMA_X11_DESKTOP_FILENAME plasma.desktop CACHE INTERNAL)
set(PLASMA_WAYLAND_DESKTOP_FILENAME plasmawayland.desktop CACHE INTERNAL)
endif()
configure_file(plasmax11.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PLASMA_X11_DESKTOP_FILENAME})
configure_file(plasmax11.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasmax11.desktop)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/${PLASMA_X11_DESKTOP_FILENAME}
${CMAKE_CURRENT_BINARY_DIR}/plasmax11.desktop
DESTINATION ${KDE_INSTALL_DATADIR}/xsessions
)
configure_file(plasmawayland.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PLASMA_WAYLAND_DESKTOP_FILENAME})
configure_file(plasmawayland.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasmawayland.desktop)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/${PLASMA_WAYLAND_DESKTOP_FILENAME}
${CMAKE_CURRENT_BINARY_DIR}/plasmawayland.desktop
DESTINATION ${KDE_INSTALL_DATADIR}/wayland-sessions
)

Loading…
Cancel
Save