Browse Source

Don't hardcode include directory for plugins

BtbN 11 years ago
parent
commit
d09f6dae1f
2 changed files with 7 additions and 1 deletions
  1. 7 0
      libobs/CMakeLists.txt
  2. 0 1
      plugins/CMakeLists.txt

+ 7 - 0
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
+	"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+	"$<INSTALL_INTERFACE:${OBS_INCLUDE_DESTINATION}>")
+
+
 target_link_libraries(libobs
 	PRIVATE
 		jansson

+ 0 - 1
plugins/CMakeLists.txt

@@ -1,4 +1,3 @@
-include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
 
 if(WIN32)
 	add_subdirectory(win-wasapi)