diff options
| author | Marvin W <git@larma.de> | 2021-05-14 10:17:51 +0200 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2021-05-14 10:17:51 +0200 |
| commit | bec73ed3714fc89627392b1dfc74d1b919dbe355 (patch) | |
| tree | 9c8c979053e97f9a722fc23ea6fa6aec5d9fb4a1 | |
| parent | 3bfd407843fc414bde78831c714579a2c6844ef1 (diff) | |
| download | dino-bec73ed3714fc89627392b1dfc74d1b919dbe355.tar.gz dino-bec73ed3714fc89627392b1dfc74d1b919dbe355.zip | |
RTP: Fix GStreamer version check
| -rw-r--r-- | cmake/FindGIO.cmake | 1 | ||||
| -rw-r--r-- | cmake/FindGstRtp.cmake | 5 | ||||
| -rw-r--r-- | plugins/rtp/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cmake/FindGIO.cmake b/cmake/FindGIO.cmake index 7d2fd65b..8ed4cb65 100644 --- a/cmake/FindGIO.cmake +++ b/cmake/FindGIO.cmake @@ -8,7 +8,6 @@ find_pkg_config_with_fallback(GIO ) if(GIO_FOUND AND NOT GIO_VERSION) - # TODO find_package(GLib ${GLib_GLOBAL_VERSION}) set(GIO_VERSION ${GLib_VERSION}) endif() diff --git a/cmake/FindGstRtp.cmake b/cmake/FindGstRtp.cmake index 0756a985..e13a1be7 100644 --- a/cmake/FindGstRtp.cmake +++ b/cmake/FindGstRtp.cmake @@ -8,6 +8,11 @@ find_pkg_config_with_fallback(GstRtp DEPENDS Gst ) +if(GstRtp_FOUND AND NOT GstRtp_VERSION) + find_package(Gst) + set(GstRtp_VERSION ${Gst_VERSION}) +endif() + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GstRtp REQUIRED_VARS GstRtp_LIBRARY diff --git a/plugins/rtp/CMakeLists.txt b/plugins/rtp/CMakeLists.txt index 52419425..3264e24a 100644 --- a/plugins/rtp/CMakeLists.txt +++ b/plugins/rtp/CMakeLists.txt @@ -12,7 +12,7 @@ find_packages(RTP_PACKAGES REQUIRED GstAudio ) -if(Gst_VERSION VERSION_GREATER "1.16") +if(GstRtp_VERSION VERSION_GREATER "1.16") set(RTP_DEFINITIONS GST_1_16) endif() |