Review Request 119339: Copy updates for PyQt4 build system changes from kdelilbs to e-c-m

[Scott Kitterman]

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

Review request for Extra Cmake Modules, Alex Merry, Luca Beltrame, Raphael Kubo da Costa, and Simon Edwards.


Repository: extra-cmake-modules


Description
-------

Since PyQt 4.10, PyQt.pyqtconfig is deprecated and not available unless PyQt is built using the old configure script.

There is no direct replacement for it, as PyQt's new build system does not provide as much information as before by design. Luckily, most of the variables we are interested in can be obtained from PyQt's QtCore module itself even if its old build system is used.

The only exception is pyqt_sip_dir, which cannot be determined at all if pyqtconfig is not available. In this case, the most we can do is guess the default path like QScintilla2 does, and fail if it does not exist.
The user then needs to specify it manually via CMake with something like -DPYQT4_SIP_DIR=/usr/share/sip/PyQt4. To this effect, all variables set by FindPyQt4.cmake have been made cache variables, which means their values can be overriden by the user, thus ignoring the contents read via FindPyQt.py.

This is identical to http://commits.kde.org/kdelibs/a7e47438d4e3469dc9df70d613826cb360fc8d19 which was review https://git.reviewboard.kde.org/r/119302/ .  We should make the same change in e-c-m prior to work to make the module work for either PyQt4 or PyQt5.


Diffs
-----


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


Testing
-------

No additional testing done for this change, but it's identical to the kdelibs change.


Thanks,

Scott Kitterman

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-buildsystem/attachments/20140717/b2ff92f3/attachment.html>