diff --git a/CMakeLists.txt b/CMakeLists.txt index 27317c3..64d36cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,8 +100,6 @@ if(Q_WS_X11) add_feature_info("Automated testing of X clients" X11_XTest_FOUND "The X11 Testing Resource extension library is useful for automated testing of X clients") - add_feature_info("libXau" X11_Xau_FOUND "The X11 Authorization Protocol library may be used by KDM") - add_feature_info("LibXdmcp" X11_Xdmcp_FOUND "The X Display Manager Control Protocol library may be used by KDM") if(NOT X11_Xkbfile_FOUND) message(FATAL_ERROR "The X11 keyboard layout library was not found. Required for building keyboard modules.") endif() @@ -262,11 +260,6 @@ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") macro_optional_add_subdirectory(appmenu) endif(NOT WIN32) - if(X11_Xau_FOUND AND X11_Xdmcp_FOUND) - macro_optional_add_subdirectory( kdm ) - else(X11_Xau_FOUND AND X11_Xdmcp_FOUND) - message(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile") - endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND) endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") if(NOT WIN32) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index af00f4c..d49d590 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(kdm) add_subdirectory(klipper) add_subdirectory(kfontview) add_subdirectory(kmenuedit) diff --git a/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake b/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake index 3cf746b..0af75fa 100644 --- a/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake +++ b/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=XSession -Exec=${BIN_INSTALL_DIR}/startkde --failsafe -TryExec=${BIN_INSTALL_DIR}/startkde +Exec=/usr/bin/startkde --failsafe +TryExec=/usr/bin/startkde DesktopNames=KDE Name=KDE Plasma Workspace (failsafe session) Name[ar]=مساحة عمل بلازما كدي (الجلسة الآمنة) diff --git a/kdm/kfrontend/sessions/kde-plasma.desktop.cmake b/kdm/kfrontend/sessions/kde-plasma.desktop.cmake index 613f7dd..40089bb 100644 --- a/kdm/kfrontend/sessions/kde-plasma.desktop.cmake +++ b/kdm/kfrontend/sessions/kde-plasma.desktop.cmake @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Type=XSession -Exec=${BIN_INSTALL_DIR}/startkde -TryExec=${BIN_INSTALL_DIR}/startkde +Exec=/usr/bin/startkde +TryExec=/usr/bin/startkde DesktopNames=KDE Name=KDE Plasma Workspace Name[ar]=مساحة عمل بلازما كدي