Review Request 126618: Make CMake macro kcoreaddons_desktop_to_json() work on windows.

[Alex Richardson]

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



+1

Another solution would be to have a config-desktopfileparser.h.cmake with `#define KDE_INSTALL_KSERVICETYPES5DIR @KDE_INSTALL_KSERVICETYPES5DIR@` and then check `if QFile::exists(KDE_INSTALL_KSERVICETYPES5DIR + path)` before checking applicationDirPath. But that can be done in a separate commit.


KF5CoreAddonsMacros.cmake (line 54)
<https://git.reviewboard.kde.org/r/126618/#comment63632>

    Use KDE_INSTALL_FULL_KSERVICETYPES5DIR instead of prepending CMAKE_INSTALL_PREFIX to the relative path.


- Alex Richardson


On March 8, 2016, 8:35 p.m., Kåre Särs wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/126618/
> -----------------------------------------------------------
> 
> (Updated March 8, 2016, 8:35 p.m.)
> 
> 
> Review request for KDE Frameworks.
> 
> 
> Repository: kcoreaddons
> 
> 
> Description
> -------
> 
> Without this patch kcoreaddons_desktop_to_json() will not find the service type destop file.
> 
> On windows GenericDataLocation returns "C:/Users/<USER>/AppData/Local" or "C:/ProgramData". That is not a path that contains any destop files ;)
> 
> This patch adds KDE_INSTALL_KSERVICETYPES5DIR as fist item in the search paths and if not found searches like before and adds ../share/ if the previous searches do not return a match.
> 
> 
> Diffs
> -----
> 
>   KF5CoreAddonsMacros.cmake 5d8e3d4 
>   src/lib/plugin/desktopfileparser.cpp 319d29f 
> 
> Diff: https://git.reviewboard.kde.org/r/126618/diff/
> 
> 
> Testing
> -------
> 
> KTextEditor compiles on windows
> 
> 
> Thanks,
> 
> Kåre Särs
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20160308/6ae9b8b8/attachment.html>