diff --git a/src/osgPlugins/gstreamer/CMakeLists.txt b/src/osgPlugins/gstreamer/CMakeLists.txt index 8cfb5622e..53c6f271c 100644 --- a/src/osgPlugins/gstreamer/CMakeLists.txt +++ b/src/osgPlugins/gstreamer/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES( ${GLIB_INCLUDE_DIRS} ) -SET(TARGET_EXTERNAL_LIBRARIES +SET(TARGET_EXTERNAL_LIBRARIES ${GSTREAMER_LIBRARIES} ${GSTREAMER_APP_LIBRARIES} ${GSTREAMER_PBUTILS_LIBRARIES} @@ -11,7 +11,7 @@ SET(TARGET_EXTERNAL_LIBRARIES ${GLIB_GOBJECT_LIBRARIES} ) -SET(TARGET_SRC +SET(TARGET_SRC GStreamerImageStream.cpp ReaderWriterGStreamer.cpp ) @@ -20,5 +20,14 @@ SET(TARGET_H GStreamerImageStream.hpp ) + +IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + + REMOVE_CXX_FLAG(-pedantic) + + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-variadic-macros") + +ENDIF() + #### end var setup ### SETUP_PLUGIN(gstreamer) diff --git a/src/osgPlugins/gstreamer/GStreamerImageStream.cpp b/src/osgPlugins/gstreamer/GStreamerImageStream.cpp index 14e5a852a..ebb054baf 100644 --- a/src/osgPlugins/gstreamer/GStreamerImageStream.cpp +++ b/src/osgPlugins/gstreamer/GStreamerImageStream.cpp @@ -76,7 +76,7 @@ bool GStreamerImageStream::open(const std::string& filename) // build pipeline - gchar *audio_pipe = ""; + const gchar *audio_pipe = ""; if( has_audio_stream ) audio_pipe = "deco. ! queue ! audioconvert ! autoaudiosink";