From f086fccfc188d28bac0f9661d7072ee5125400bd Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Tue, 13 Jun 2017 14:19:45 +0000 Subject: [PATCH] use libgstreamer1.0 for lunar --- CMakeLists.txt | 4 ++++ package.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1129cc6..98166b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,10 @@ project(gscam) # System Dependencies find_package(PkgConfig) +pkg_check_modules(GSTREAMER QUIET gstreamer-0.10) +if(NOT GSTREAMER_FOUND) + set(GSTREAMER_VERSION_1_x TRUE) +endif() if(GSTREAMER_VERSION_1_x) message(STATUS "gst 1.0") pkg_check_modules(GSTREAMER REQUIRED gstreamer-1.0) diff --git a/package.xml b/package.xml index c4f9e8f..6581bc4 100644 --- a/package.xml +++ b/package.xml @@ -15,8 +15,8 @@ catkin - libgstreamer0.10-dev - libgstreamer-plugins-base0.10-dev + libgstreamer1.0-dev + libgstreamer-plugins-base1.0-dev nodelet cv_bridge