Merge pull request #152 from BtbN/cmake_fixes

Cmake fixes
This commit is contained in:
Jim 2014-07-10 20:43:23 -07:00
commit 83c041e14f
3 changed files with 7 additions and 2 deletions

View File

@ -60,7 +60,6 @@ if(APPLE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
list(APPEND CMAKE_INSTALL_RPATH "@loader_path/" "@executable_path/")
elseif(UNIX AND NOT UNIX_STRUCTURE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN")
endif()

View File

@ -253,7 +253,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"
@ -264,6 +266,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

View File

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