Review Request 124212: kwindowsystem: Change source file layout

[Martin Gräßlin]

> On June 30, 2015, 10:30 a.m., Kai Uwe Broulik wrote:
> > Doesn't build on OSX:
> > 
> > [ 24%] Building CXX object src/CMakeFiles/KF5WindowSystem.dir/platforms/osx/kkeyserver_mac.cpp.o
> > [ 27%] Building CXX object src/CMakeFiles/KF5WindowSystem.dir/KF5WindowSystem_automoc.cpp.o
> > In file included from /Users/broulik/Documents/kf5/kwindowsystem/src/kkeyserver.cpp:23:
> > /Users/broulik/Documents/kf5/kwindowsystem/src/kkeyserver.h:34:10: fatal error: 'kkeyserver_mac.h' file not found
> > #include "kkeyserver_mac.h"
> >          ^
> > 1 error generated.
> > make[2]: *** [src/CMakeFiles/KF5WindowSystem.dir/kkeyserver.cpp.o] Error 1
> > make[2]: *** Waiting for unfinished jobs....
> > /Users/broulik/Documents/kf5/kwindowsystem/src/platforms/osx/kkeyserver_mac.cpp:64:13: warning: unused variable
> >       'lastLayoutID' [-Wunused-variable]
> > static long lastLayoutID = -1;
> >             ^
> > 1 warning generated.
> > make[1]: *** [src/CMakeFiles/KF5WindowSystem.dir/all] Error 2
> > make: *** [all] Error 2
> 
> Martin Gräßlin wrote:
>     did it build before?
> 
> Kai Uwe Broulik wrote:
>     yes

can you please test with:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adf1e34..0cbab72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,6 +46,7 @@ if (KWINDOWSYSTEM_HAVE_X11)
 endif ()
 
 if (APPLE)
+   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/osx)
    set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/osx/kkeyserver_mac.cpp
 #                                                 kwindowsystem_mac.cpp
 # FIXME: adjust kwindowinfo_mac to inherit from KWindowInfoPrivate
@@ -55,6 +56,7 @@ if (APPLE)
 endif ()
 
 if (WIN32)
+   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/windows)
    set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/windows/kkeyserver_win.cpp
 #                                                 kwindowsystem_win.cpp
 # FIXME: adjust kwindowinfo_win to inherit from KWindowInfoPrivate


- Martin


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/124212/#review81880
-----------------------------------------------------------


On June 30, 2015, 8:19 a.m., Martin Gräßlin wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/124212/
> -----------------------------------------------------------
> 
> (Updated June 30, 2015, 8:19 a.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: kwindowsystem
> 
> 
> Description
> -------
> 
> In the src directory we introduce a platforms directory with a specific
> * osx
> * wayland
> * windows
> * xcb
> 
> sub directory. The platform specific source and header files are moved
> into those directories.
> 
> This is a preparation step to move the platform specific behavior into
> plugins which get loaded at runtime. Such a change is required to
> support more platforms in future for which kwindowsystem cannot provide
> support directly. An example is proper Wayland support on the Plasma
> platform. It needs to provide its own implementationn which has to
> differ from the generic Wayland implementation.
> 
> 
> Diffs
> -----
> 
>   src/kxutils_p.h  
>   src/netwm.h  
>   src/netwm.cpp  
>   src/netwm_p.h  
>   src/platforms/CMakeLists.txt PRE-CREATION 
>   src/platforms/osx/CMakeLists.txt PRE-CREATION 
>   src/platforms/wayland/CMakeLists.txt PRE-CREATION 
>   src/platforms/windows/CMakeLists.txt PRE-CREATION 
>   src/platforms/xcb/CMakeLists.txt PRE-CREATION 
>   src/kxutils.cpp  
>   src/kxmessages.h  
>   src/kxmessages.cpp  
>   src/kxerrorhandler_p.h  
>   src/kxerrorhandler.cpp  
>   src/kwindowsystem_win.cpp  
>   src/kwindowsystem_x11.cpp  
>   src/kselectionowner.cpp  
>   src/kselectionowner.h  
>   src/kmanagerselection.h  
>   src/kkeyserver_x11.cpp  
>   src/kkeyserver_win.cpp  
>   src/kkeyserver_x11.h  
>   src/kkeyserver_win.h  
>   src/kkeyserver_mac.cpp  
>   src/fixx11h.h  
>   src/kkeyserver_mac.h  
>   src/CMakeLists.txt ff2ce392ecd7969eb94543528c7a670ea0fcd870 
>   autotests/CMakeLists.txt dda0af259b292ee5e526bb9166811fc1b376f388 
>   src/kwindowsystem_wayland.cpp  
>   src/kwindowsystem_p_x11.h  
>   src/kwindowsystem_p_wayland.h  
>   src/kwindowsystem_mac.cpp  
>   src/kwindowsystem.cpp 789132e1b4883dd54218d29af9710dedfe6218e1 
>   src/kwindowinfo_x11.cpp  
>   src/kwindowinfo_p_x11.h  
>   src/kwindowinfo_win.cpp  
>   src/kwindowinfo_mac_p.h  
>   src/kwindowinfo_mac.cpp  
>   src/kselectionwatcher.cpp  
>   src/kwindoweffects_x11.cpp  
>   src/kselectionwatcher.h  
> 
> Diff: https://git.reviewboard.kde.org/r/124212/diff/
> 
> 
> Testing
> -------
> 
> compiles, installs and autotest pass on platform Linux/xcb
> 
> 
> Thanks,
> 
> Martin Gräßlin
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20150630/9210375e/attachment-0001.html>