[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.icc-effect-5.14.5
parent
3041a7c32d
commit
a4ca6f196e
|
@ -596,10 +596,9 @@ install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||||
if(HAVE_WAYLAND)
|
if(HAVE_WAYLAND)
|
||||||
include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
|
include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
|
||||||
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
|
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
|
||||||
kf5_add_kdeinit_executable(kwin_wayland main_wayland.cpp)
|
add_executable(kwin_wayland main_wayland.cpp)
|
||||||
target_link_libraries(kdeinit_kwin_wayland kwin)
|
target_link_libraries(kwin_wayland kwin)
|
||||||
|
|
||||||
install(TARGETS kdeinit_kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
|
||||||
install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||||
|
|
||||||
add_subdirectory(backends)
|
add_subdirectory(backends)
|
||||||
|
|
|
@ -408,8 +408,7 @@ static QString automaticBackendSelection()
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
extern "C"
|
int main(int argc, char * argv[])
|
||||||
KWIN_EXPORT int kdemain(int argc, char * argv[])
|
|
||||||
{
|
{
|
||||||
// process command line arguments to figure out whether we have to start Xwayland and the Wayland socket
|
// process command line arguments to figure out whether we have to start Xwayland and the Wayland socket
|
||||||
QByteArray waylandSocket;
|
QByteArray waylandSocket;
|
||||||
|
|
Loading…
Reference in New Issue