From d09f6dae1ff84c61fd8d3dc0d39c44979da82186 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 6 Jul 2014 22:02:34 +0200 Subject: [PATCH] Don't hardcode include directory for plugins --- libobs/CMakeLists.txt | 7 +++++++ plugins/CMakeLists.txt | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index ed0c8feb2..da1e44aab 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -252,7 +252,9 @@ source_group("media-io\\Header Files" FILES ${libobs_mediaio_HEADERS}) source_group("util\\Source Files" FILES ${libobs_util_SOURCES}) source_group("util\\Header Files" FILES ${libobs_util_HEADERS}) + add_library(libobs SHARED ${libobs_SOURCES} ${libobs_HEADERS}) + set_target_properties(libobs PROPERTIES OUTPUT_NAME obs VERSION "0" @@ -263,6 +265,11 @@ if(NOT MSVC) target_compile_options(libobs PUBLIC "-mmmx" "-msse" "-msse2") endif() +target_include_directories(libobs PUBLIC + "$" + "$") + + target_link_libraries(libobs PRIVATE jansson diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 0a046e6a4..6aa6fcee3 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,4 +1,3 @@ -include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs") if(WIN32) add_subdirectory(win-wasapi)