Differential D1217

Add 'QTGSTREAMER_INCLUDES' to the include directories as it contains the boost header location.
ClosedPublic
Actions

Authored by tcberner on Mar 25 2016, 12:18 PM.

Details

Reviewers
rakuco
cordlandwehr
Group Reviewers
Artikulate
Commits
R72:a6651ffef0bc: Add 'QTGSTREAMER_INCLUDES' to the include directories as it contains the…
R72:18a39e9d7963: Add 'QTGSTREAMER_INCLUDES' to the include directories as it contains the…
Summary

QTGSTREAMER_INCLUDES is defined in Qt5Gstremaer/QtGStreamerConfigCommon.cmake as

	set(QTGSTREAMER_INCLUDES ${QTGSTREAMER_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})

This fixes the following build error:

[ 95%] Building CXX object libsound/src/qtgstreamerbackend/CMakeFiles/qtgstreamerbackend.dir/qtgstreamerbackend.cpp.o
cd /wrkdirs/usr/ports/misc/artikulate/work/.build/libsound/src/qtgstreamerbackend && /usr/local/libexec/ccache/c++ -DKCOREADDONS_LIB -DQT_CORE_LIB -DQT_NO_DEBUG -DQT_NO_URL_CAST_FROM_STRING -D_LARGEFILE64_SOURCE -Dqtgstreamerbackend_EXPORTS -I/wrkdirs/usr/ports/misc/artikulate/work/.build/libsound/src/qtgstreamerbackend -I/wrkdirs/usr/ports/misc/artikulate/work/artikulate-16.03.80/libsound/src/qtgstreamerbackend -I/wrkdirs/usr/ports/misc/artikulate/work/.build/libsound/src -I/wrkdirs/usr/ports/misc/artikulate/work/artikulate-16.03.80/libsound/src -I/usr/local/include/Qt5GStreamer -isystem /usr/local/include/KF5/KCoreAddons -isystem /usr/local/include/KF5 -isystem /usr/local/include/qt5 -isystem /usr/local/include/qt5/QtCore -isystem /usr/local/lib/qt5/mkspecs/freebsd-clang -isystem /usr/local/include/KF5/KI18n -O2 -pipe -fstack-protector -fno-strict-aliasing -std=c++0x -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -fexceptions -O2 -pipe -fstack-protector -fno-strict-aliasing -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -fPIC -o CMakeFiles/qtgstreamerbackend.dir/qtgstreamerbackend.cpp.o -c /wrkdirs/usr/ports/misc/artikulate/work/artikulate-16.03.80/libsound/src/qtgstreamerbackend/qtgstreamerbackend.cpp
In file included from /wrkdirs/usr/ports/misc/artikulate/work/artikulate-16.03.80/libsound/src/qtgstreamerbackend/qtgstreamerbackend.cpp:19:
In file included from /wrkdirs/usr/ports/misc/artikulate/work/artikulate-16.03.80/libsound/src/qtgstreamerbackend/qtgstreamercapturebackend.h:26:
In file included from /usr/local/include/Qt5GStreamer/QGst/Global:1:
In file included from /usr/local/include/Qt5GStreamer/QGst/global.h:25:
In file included from /usr/local/include/Qt5GStreamer/QGst/../QGlib/type.h:22:
/usr/local/include/Qt5GStreamer/QGst/../QGlib/global.h:26:10: fatal error: 'boost/config.hpp' file not found
#include <boost/config.hpp>

^

1 error generated.

Diff Detail

Repository
R72 Artikulate
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
tcberner updated this revision to Diff 2948.Mar 25 2016, 12:18 PM
tcberner retitled this revision from to Add 'QTGSTREAMER_INCLUDES' to the include directories as it contains the boost header location..
tcberner updated this object.
tcberner edited the test plan for this revision. (Show Details)
tcberner added a reviewer: Artikulate.
tcberner updated this object.Mar 25 2016, 12:20 PM
tcberner added a reviewer: rakuco.
rakuco edited edge metadata.Mar 25 2016, 1:02 PM

The patch makes sense to me. Since QTGSTREAMER_INCLUDES already contains QTGSTREAMER_INCLUDE_DIR, you can probably remove the latter from include_directories().

tcberner updated this revision to Diff 2950.Mar 25 2016, 1:44 PM
tcberner updated this object.
tcberner edited edge metadata.

QTGSTREAMER_INCLUDES already contains QTGSTREAMER_INCLUDE_DIR. So the latter
is no longer needed.

rakuco added a reviewer: cordlandwehr.Mar 25 2016, 2:01 PM
rakuco added a subscriber: cordlandwehr.

Looks good to me, but @cordlandwehr should probably take a look at this too.

cordlandwehr accepted this revision.Mar 26 2016, 8:29 AM
cordlandwehr edited edge metadata.

LGTM, please directly commit to the Applications/16.04 branch

This revision is now accepted and ready to land.Mar 26 2016, 8:29 AM
Closed by commit R72:a6651ffef0bc: Add 'QTGSTREAMER_INCLUDES' to the include directories as it contains the… (authored by tcberner). · Explain WhyMar 28 2016, 4:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2979

View Options

libsound/src/qtgstreamerbackend/CMakeLists.txt

Loading...