Review Request 118192: Do not set the INSTALL_RPATH_USE_LINK_PATH and INSTALL_RPATH properties

[Alex Merry]

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

(Updated May 19, 2014, 5:06 p.m.)


Review request for KDE Frameworks and Alex Merry.


Changes
-------

The generated plugins cannot be built without Qt5Designer's include directories being set, so deal with that in the kf5designerplugin_add_plugin macro. kf5designerplugin_generate_plugin now secretly takes a "TARGET" argument, allowing those same include directories to be used when generating the moc part.


Summary (updated)
-----------------

Do not set the INSTALL_RPATH_USE_LINK_PATH and INSTALL_RPATH properties


Repository: kdesignerplugin


Description
-------

Do not set the INSTALL_RPATH_USE_LINK_PATH and INSTALL_RPATH properties

INSTALL_RPATH_USE_LINK_PATH already defaults to TRUE, and INSTALL_RPATH
already has a sensible default, because of the KDECMakeSettings module
from ECM.

This also adds a comment explaining why the other RPath properties are
set.

Replace the installed macros

The existing macro (kf5designerplugin_add_widget_files) did not work (it
tried to iterate of the name of the sources variable instead of
${ARGN}), and the API didn't really make sense anyway (you cannot
combine multiple plugin instance classes into a single plugin library,
so accepting multiple .widgets files does not make sense).

kf5designerplugin_add_widget_files is therefore replaced with
kf5designerplugin_generate_plugin (which does the same, but for a single
widget file), and we also have kf5designerplugin_add_plugin, which
replaces the usual add_library call, and automagically deals with
.widgets files and .qrc files it is passed.

The two designer plugins provided by KDesignerPlugin are then generated
using kf5designerplugin_add_plugin, so we can be sure it actually works.


Diffs (updated)
-----

  CMakeLists.txt c90208bc13a13b6dc8824c86ee102c5b42369331 
  KF5DesignerPluginMacros.cmake 43fde97f0e07a9d00d79f92bee1888bf8fcbf70c 
  src/CMakeLists.txt 2e7b9f0aa3a2ba5adc388961919a635b8ec6a2c2 

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


Testing
-------

Builds, installs, plugins seem to work in designer. I'm planning to write some autotests as well.


Thanks,

Alex Merry

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