Merge pull request #2 from ThePBone/master

noahbliss · Sep 20, 2020 · a5c1b03 · a5c1b03
2 parents f6b4d8b + 1a2a974
commit a5c1b03
Show file tree

Hide file tree

Showing 3 changed files with 2,013 additions and 1,768 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,21 +5,24 @@ include_directories(.)
 include_directories(src)
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(GST REQUIRED gstreamer-1.0>=1.0
+pkg_check_modules(GST REQUIRED
+        gstreamer-1.0>=1.0
         gstreamer-base-1.0>=1.0
         gstreamer-controller-1.0>=1.0
         gstreamer-audio-1.0>=1.0)
 
+pkg_check_modules(GLIB REQUIRED
+        glib-2.0
+        gio-unix-2.0)
+
 file(GLOB SOURCES
         src/*.h
-        src/*.c
-        )
+        src/*.c)
 
 add_library(gst-plugin-viperfx SHARED ${SOURCES})
 
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET glib-2.0 gio-unix-2.0)
-target_include_directories(gst-plugin-viperfx PUBLIC ${GST_INCLUDE_DIRS})
-target_compile_options(gst-plugin-viperfx PUBLIC ${GST_CFLAGS})
-target_link_libraries(gst-plugin-viperfx ${GST_LIBRARIES} pthread PkgConfig::deps)
+target_include_directories(gst-plugin-viperfx PUBLIC ${GST_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS})
+target_compile_options(gst-plugin-viperfx PUBLIC ${GST_CFLAGS} ${GLIB_CFLAGS})
+target_link_libraries(gst-plugin-viperfx ${GST_LIBRARIES} ${GLIB_LIBRARIES})
 
 set_target_properties(gst-plugin-viperfx PROPERTIES OUTPUT_NAME "gstviperfx")