diff options
| author | Diane Trout <diane@ghic.org> | 2015-11-04 15:44:42 -0800 |
|---|---|---|
| committer | Diane Trout <diane@ghic.org> | 2015-11-04 15:44:42 -0800 |
| commit | 02d48bb4550a5b81291bc45a27cad77b2dcdb784 (patch) | |
| tree | 0c4017b7f7d0d2c93b52a3b928b8b68431e9b86d | |
| parent | 5c51c6271da6ad67e9cffa701d3f8b1684185bd1 (diff) | |
| parent | e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 (diff) | |
Merge branch 'master' into unit-test-fixes2
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/modules/FindGStreamer.cmake | 1 | ||||
| -rw-r--r-- | src/QGlib/connect.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d3e7dd..5744015 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ find_package(GObject) macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) +add_definitions(${GSTREAMER_DEFINITIONS}) include(CheckCXXSourceCompiles) check_cxx_source_compiles(" #include <QtCore/QtGlobal> diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake index dab91ac..fe6cde1 100644 --- a/cmake/modules/FindGStreamer.cmake +++ b/cmake/modules/FindGStreamer.cmake @@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) + set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) endif() find_library(GSTREAMER_LIBRARY diff --git a/src/QGlib/connect.cpp b/src/QGlib/connect.cpp index 9ff6fde..58a3367 100644 --- a/src/QGlib/connect.cpp +++ b/src/QGlib/connect.cpp @@ -21,8 +21,10 @@ #include <QtCore/QHash> #include <QtCore/QMutex> #include <boost/multi_index_container.hpp> +#ifndef Q_MOC_RUN // See: https://bugreports.qt-project.org/browse/QTBUG-22829 #include <boost/multi_index/sequenced_index.hpp> #include <boost/multi_index/ordered_index.hpp> +#endif #include <boost/multi_index/member.hpp> namespace QGlib { diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index fd09bf8..6b53366 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${QTGSTREAMER_INCLUDES}) +include_directories(${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_PBUTILS_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${QTGSTREAMER_INCLUDES}) add_definitions(${QTGSTREAMER_DEFINITIONS} -DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE) add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}") |