[screenlocker] Make it possible to build kscreenlocker without ksmserver

Move defines specific to kscreenlocker from config-ksmserver.h to new
file config-kscreenlocker.h. And also adjust cmake bit

REVIEW: 125892

ksmserver/config-ksmserver.h.cmake

@@ -1,12 +1,4 @@
 /* Define to 1 if you have the `_IceTransNoListen' function. */
 #cmakedefine HAVE__ICETRANSNOLISTEN 1
 
-#ifndef KSMSERVER_UNIT_TEST
-#define KCHECKPASS_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kcheckpass"
-#else
-#define KCHECKPASS_BIN "${CMAKE_CURRENT_BINARY_DIR}/screenlocker/greeter/autotests/fakekcheckpass"
-#endif
-
-#define KSCREENLOCKER_GREET_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kscreenlocker_greet"
-
 #define KWIN_BIN "${KWIN_BIN}"

ksmserver/screenlocker/CMakeLists.txt

@@ -4,10 +4,12 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kscreenlocker\")
 # adjusting CMAKE_C_FLAGS to get wayland protocols to compile
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
 
+configure_file(config-kscreenlocker.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kscreenlocker.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 add_subdirectory(kcheckpass)
 add_subdirectory(greeter)
 add_subdirectory(kcm)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
 
 set(screensaver_dbusXML dbus/org.freedesktop.ScreenSaver.xml)
 set(kscreensaver_dbusXML dbus/org.kde.screensaver.xml)

ksmserver/screenlocker/autotests/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_definitions(-DKSMSERVER_UNIT_TEST)
+add_definitions(-DKSCREENLOCKER_UNIT_TEST)
 include(ECMMarkAsTest)
 
 #######################################

ksmserver/screenlocker/config-kscreenlocker.h.cmake

@@ -0,0 +1,7 @@
+#ifndef KSCREENLOCKER_UNIT_TEST
+#define KCHECKPASS_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kcheckpass"
+#else
+#define KCHECKPASS_BIN "${CMAKE_CURRENT_BINARY_DIR}/greeter/autotests/fakekcheckpass"
+#endif
+
+#define KSCREENLOCKER_GREET_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kscreenlocker_greet"

ksmserver/screenlocker/greeter/CMakeLists.txt

@@ -4,7 +4,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kscreenlocker_greet\")
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ../kcheckpass
-    ${CMAKE_CURRENT_BINARY_DIR}/../../
+    ${CMAKE_CURRENT_BINARY_DIR}/../
 )
 
 set(kscreenlocker_greet_SRCS

ksmserver/screenlocker/greeter/authenticator.cpp

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "authenticator.h"
 #include <kcheckpass-enums.h>
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 
 // Qt
 #include <QFile>

ksmserver/screenlocker/greeter/autotests/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_definitions(-DKSMSERVER_UNIT_TEST)
+add_definitions(-DKSCREENLOCKER_UNIT_TEST)
 include(ECMMarkAsTest)
 
 #####################################

ksmserver/screenlocker/greeter/autotests/killtest.cpp

@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 // own
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 // Qt
 #include <QDebug>
 #include <QtTest/QtTest>

ksmserver/screenlocker/kcm/CMakeLists.txt

@@ -5,7 +5,7 @@ set(screenlocker_kcm_SRCS
     kcm.cpp
     selectimagebutton.cpp
 )
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
 
 ki18n_wrap_ui(screenlocker_kcm_SRCS kcm.ui)
 kconfig_add_kcfg_files(screenlocker_kcm_SRCS ../kcfg/kscreensaversettings.kcfgc)

ksmserver/screenlocker/kcm/kcm.cpp

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kscreensaversettings.h"
 #include "ui_kcm.h"
 #include "screenlocker_interface.h"
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 #include <KActionCollection>
 #include <KGlobalAccel>
 #include <KCModule>

ksmserver/screenlocker/ksldapp.cpp

@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "waylandlocker.h"
 #include "logind.h"
 #include "kscreensaversettings.h"
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 #include <config-X11.h>
 #include "waylandserver.h"
 // KDE

ksmserver/screenlocker/waylandserver.cpp

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "waylandserver.h"
 // ksld
-#include <config-ksmserver.h>
+#include <config-kscreenlocker.h>
 // Wayland
 #include <wayland-server.h>
 #include <wayland-ksld-server-protocol.h>