From a4ca6f196eabdededdb251f3d31068d8e7591066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 6 Jul 2015 09:57:30 +0200 Subject: [PATCH] [wayland] kwin_wayland is no longer a kdeinit_executable kdeinit_executable doesn't make sense in the case of kwin_wayland as start_kdeinit_wrapper will be executed after kwin_wayland thus the framework doesn't work. --- CMakeLists.txt | 5 ++--- main_wayland.cpp | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b03d6fe59e..735cd8105c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -596,10 +596,9 @@ install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} ) if(HAVE_WAYLAND) include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS}) include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) - kf5_add_kdeinit_executable(kwin_wayland main_wayland.cpp) - target_link_libraries(kdeinit_kwin_wayland kwin) + add_executable(kwin_wayland main_wayland.cpp) + target_link_libraries(kwin_wayland kwin) - install(TARGETS kdeinit_kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} ) add_subdirectory(backends) diff --git a/main_wayland.cpp b/main_wayland.cpp index 6ecbe6afff..5cd353b2d6 100644 --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -408,8 +408,7 @@ static QString automaticBackendSelection() } // namespace -extern "C" -KWIN_EXPORT int kdemain(int argc, char * argv[]) +int main(int argc, char * argv[]) { // process command line arguments to figure out whether we have to start Xwayland and the Wayland socket QByteArray waylandSocket;