[Kde-pim] Review Request: Only use the cmake config file from QJson >= 0.7.2

[Philip Muskovac]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/107189/
-----------------------------------------------------------

(Updated Nov. 3, 2012, 3:31 p.m.)


Review request for KDEPIM-Libraries.


Description
-------

Currently kdepimlibs tries to use a qjson cmake config file if one exists and expects it to set the same variables it does when pkg-config is used.
The problem is that qjson 0.7.1 ships a config file too, but with with different variables (qjson_LIBRARIES, qjson_INCLUDE_DIR) so it shouldn't be used.

This change makes sure that for qjson << 0.7.2 the old pkg-config check is used which works fine.


Diffs
-----

  cmake/modules/FindQJSON.cmake 9701c81 

Diff: http://git.reviewboard.kde.org/r/107189/diff/


Testing (updated)
-------

Successful compile run of kdeplasma-addons. The youtube runner fails to build currently


Thanks,

Philip Muskovac

_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/