Merge pull request #189 from BtbN/cmake_jansson_fix

Fix Jansson dependency importing

CMakeLists.txt

@@ -66,9 +66,6 @@ endif()
 if(NOT INSTALLER_RUN)
 	add_subdirectory(deps)
 
-	add_definitions(-DHAVE_CONFIG_H=1)
-	include_directories("${CMAKE_BINARY_DIR}/config")
-
 	add_subdirectory(libobs)
 
 	if(WIN32)

deps/CMakeLists.txt

@@ -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()

libobs/CMakeLists.txt

@@ -48,6 +48,8 @@ endif()
 
 add_definitions(-DLIBOBS_EXPORTS)
 
+include_directories(${OBS_JANSSON_INCLUDE_DIRS})
+
 if(WIN32)
 	set(libobs_PLATFORM_SOURCES
 		obs-windows.c
@@ -268,14 +270,15 @@ endif()
 
 target_include_directories(libobs PUBLIC
 	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+	"$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/config>"
 	"$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}>")
 
 
 target_link_libraries(libobs
 	PRIVATE
-		jansson
 		${libobs_PLATFORM_DEPS}
 		${libobs_image_loading_LIBRARIES}
+		${OBS_JANSSON_IMPORT}
 		${LIBSWSCALE_LIBRARIES}
 		${LIBSWRESAMPLE_LIBRARIES}
 		${LIBAVFORMAT_LIBRARIES}

plugins/rtmp-services/CMakeLists.txt

@@ -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)