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

[Kåre Särs]

-----------------------------------------------------------
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.


Changes
-------

Add KDE_INSTALL_KSERVICETYPES5DIR as the first search path (in CMake)


Repository: kcoreaddons


Description (updated)
-------

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 (updated)
-----

  KF5CoreAddonsMacros.cmake 5d8e3d4 
  src/lib/plugin/desktopfileparser.cpp 319d29f 

Diff: https://git.reviewboard.kde.org/r/126618/diff/


Testing (updated)
-------

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/1c83fd43/attachment.html>