Browse Source

cmake: Remove find_package for ORTP and Mediastreamer2 libraries

- Use pkg-config instead because their cmake configs are not up to standard and complicates things
Xenofon Karamanos 3 months ago
parent
commit
42e1a9c3c5
1 changed files with 9 additions and 12 deletions
  1. 9 12
      src/modules/rtp_media_server/CMakeLists.txt

+ 9 - 12
src/modules/rtp_media_server/CMakeLists.txt

@@ -2,18 +2,15 @@ file(GLOB MODULE_SOURCES "*.c")
 
 add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-find_package(ortp QUIET)
-if(NOT ortp_FOUND)
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(ortp REQUIRED IMPORTED_TARGET ortp)
-  add_library(ortp ALIAS PkgConfig::ortp)
-endif()
+find_package(PkgConfig REQUIRED)
 
-find_package(mediastreamer2 QUIET)
-if(NOT mediastreamer2_FOUND)
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(mediastreamer2 REQUIRED IMPORTED_TARGET mediastreamer)
-  add_library(mediastreamer2 ALIAS PkgConfig::mediastreamer2)
-endif()
+# ortp and mediastreamer2 do have cmake support on newer version but
+# is not up to standard and complicates things.
+# So we use pkg-config to find them.
+pkg_check_modules(ortp REQUIRED IMPORTED_TARGET ortp)
+add_library(ortp ALIAS PkgConfig::ortp)
+
+pkg_check_modules(mediastreamer2 REQUIRED IMPORTED_TARGET mediastreamer)
+add_library(mediastreamer2 ALIAS PkgConfig::mediastreamer2)
 
 target_link_libraries(${module_name} PRIVATE ortp mediastreamer2)