Fix Jansson dependency importing
parent
5da8d14570
commit
3b26db389d
|
@ -6,12 +6,14 @@ find_package(Jansson 2.5 QUIET)
|
|||
|
||||
if(NOT JANSSON_FOUND)
|
||||
message(STATUS "Jansson >=2.5 not found, building bundled version")
|
||||
|
||||
add_subdirectory(jansson)
|
||||
|
||||
set(OBS_JANSSON_IMPORT "jansson" CACHE INTERNAL "Internal var")
|
||||
set(OBS_JANSSON_INCLUDE_DIRS "" CACHE INTERNAL "Internal var")
|
||||
else()
|
||||
message(STATUS "Using system Jansson library")
|
||||
add_library(jansson UNKNOWN IMPORTED)
|
||||
set_property(TARGET jansson PROPERTY
|
||||
IMPORTED_LOCATION "${JANSSON_LIBRARIES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${JANSSON_INCLUDE_DIRS}")
|
||||
endif()
|
||||
|
||||
set(OBS_JANSSON_IMPORT "${JANSSON_LIBRARIES}" CACHE INTERNAL "Internal var")
|
||||
set(OBS_JANSSON_INCLUDE_DIRS "${JANSSON_INCLUDE_DIRS}" CACHE INTERNAL "Internal var")
|
||||
endif()
|
||||
|
|
|
@ -48,6 +48,8 @@ endif()
|
|||
|
||||
add_definitions(-DLIBOBS_EXPORTS)
|
||||
|
||||
include_directories(${OBS_JANSSON_INCLUDE_DIRS})
|
||||
|
||||
if(WIN32)
|
||||
set(libobs_PLATFORM_SOURCES
|
||||
obs-windows.c
|
||||
|
@ -273,9 +275,9 @@ target_include_directories(libobs PUBLIC
|
|||
|
||||
target_link_libraries(libobs
|
||||
PRIVATE
|
||||
jansson
|
||||
${libobs_PLATFORM_DEPS}
|
||||
${libobs_image_loading_LIBRARIES}
|
||||
${OBS_JANSSON_IMPORT}
|
||||
${LIBSWSCALE_LIBRARIES}
|
||||
${LIBSWRESAMPLE_LIBRARIES}
|
||||
${LIBAVFORMAT_LIBRARIES}
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
project(rtmp-services)
|
||||
|
||||
include_directories(${OBS_JANSSON_INCLUDE_DIRS})
|
||||
|
||||
set(rtmp-services_SOURCES
|
||||
rtmp-common.c
|
||||
rtmp-custom.c
|
||||
|
@ -9,7 +11,7 @@ add_library(rtmp-services MODULE
|
|||
${rtmp-services_SOURCES})
|
||||
target_link_libraries(rtmp-services
|
||||
libobs
|
||||
jansson)
|
||||
${OBS_JANSSON_IMPORT})
|
||||
|
||||
install_obs_plugin(rtmp-services)
|
||||
install_obs_plugin_data(rtmp-services ../../build/data/obs-plugins/rtmp-services)
|
||||
|
|
Loading…
Reference in New Issue