Web lists-archives.com

Re: Review Request 129546: DBus-parts of baloo don't depend on inotify




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

I should elaborate on testing: if you're not on Linux, baloo assumes you don't have inotify (there's a separate review to fix that, anyway), so when you build baloo it doesn't define BUILD_KINOTIFY in cmake. The compilation fails with:

[ 68%] Building CXX object src/lib/CMakeFiles/KF5Baloo.dir/indexerconfig.cpp.o
/home/kde/sources/kf5-qt5/baloo/src/lib/indexerconfig.cpp:31:10: fatal error: 
      'maininterface.h' file not found
#include "maininterface.h"

This is because the DBUS code (contained in src/dbus) is effectively mandatory, but is guarded in src/CMakeLists.txt by BUILD_KINOTIFY.

But the dbus code doesn't actually need inotify. It works fine without it. So move that subdir outside of the if(BUILD_KINOTIFY), since (a) it doesn't need inotify and (b) other code, that doesn't need inotify, does need the dbus interface code.

- Adriaan de Groot


On November 23rd, 2016, 1:01 p.m. UTC, Adriaan de Groot wrote:

Review request for Baloo.
By Adriaan de Groot.

Updated Nov. 23, 2016, 1:01 p.m.

Repository: baloo

Description

The src/dbus directory was only added to the build if BUILD_KINOTIFY is on. But the DBus bits don't depend on inotify, and besides the DBus bits are mandatory for other parts of baloo (e.g. lib/indexerconfig.cpp includes maininterface.h unconditionally).

So move add_subdirectory(dbus) outside of the if() that it doesn't belong in.

Testing

Baloo now actually builds on FreeBSD.

Diffs

  • src/CMakeLists.txt (529b786)

View Diff