D24609: libiris: Stop using qt_wrap_cpp()

Raphael Kubo da Costa noreply at phabricator.kde.org
Sun Oct 13 14:55:07 BST 2019


rakuco created this revision.
rakuco added a reviewer: Kopete.
Herald added a project: Kopete.
Herald added a subscriber: kopete-devel.
rakuco requested review of this revision.

REVISION SUMMARY
  The build system was currently both relying on CMake's AUTOMOC handling and
  manually calling `qt_wrap_cpp()` for a few headers.
  
  The former was causing the moc-generated code to go to
  `mocs_compilation.cpp`, and the latter also caused the moc-generated
  `moc_*.cxx` to be built. This resulted in the meta object code being built
  twice, which is wrong, in the worst cause, cause linking problems.
  
  Older LLD versions were affected per
  https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=228640
  
  Drop `qt_wrap_cpp()` and include the missing moc files from the source code
  and let CMake's automoc code handle everything transparently.

TEST PLAN
  Everything built fine, and CMake stopped emitting the following warning:
  
    Policy CMP0071 is not set: Let AUTOMOC and AUTOUIC process GENERATED files.
    Run "cmake --help-policy CMP0071" for policy details.  Use the cmake_policy
    command to set the policy and suppress this warning.
    
    For compatibility, CMake is excluding the GENERATED source file(s):
    
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_xmpp_client.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_xmpp.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_xmpp_clientstream.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_xmpp_stream.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_td.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_qjdnsshared_p.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_qjdns.cxx"
      "/wrkdirs/usr/ports/net-im/kopete/work/.build/protocols/jabber/libiris/moc_qjdnsshared.cxx"
    
    from processing by AUTOMOC.  If any of the files should be processed, set
    CMP0071 to NEW.  If any of the files should not be processed, explicitly
    exclude them by setting the source file property SKIP_AUTOMOC:
    
      set_property(SOURCE file.h PROPERTY SKIP_AUTOMOC ON)

REPOSITORY
  R434 Kopete

BRANCH
  libiris-automoc

REVISION DETAIL
  https://phabricator.kde.org/D24609

AFFECTED FILES
  protocols/jabber/libiris/CMakeLists.txt
  protocols/jabber/libiris/src/jdns/src/qjdns/qjdns.cpp
  protocols/jabber/libiris/src/jdns/src/qjdns/qjdnsshared.cpp
  protocols/jabber/libiris/src/xmpp/xmpp-core/connector.cpp
  protocols/jabber/libiris/src/xmpp/xmpp-core/stream.cpp
  protocols/jabber/libiris/src/xmpp/xmpp-im/client.cpp

To: rakuco, #kopete
Cc: kopete-devel, himanshuvishwakarma, cochise
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kopete-devel/attachments/20191013/0e24618f/attachment.html>


More information about the kopete-devel mailing list