mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-03 01:53:35 +00:00
deps,shared,plugins: Move opts-parser to shared folder
This commit is contained in:
parent
21b47c4f91
commit
6cca6f88d9
1
deps/CMakeLists.txt
vendored
1
deps/CMakeLists.txt
vendored
|
@ -5,4 +5,3 @@ endif()
|
|||
add_subdirectory(blake2)
|
||||
add_subdirectory(glad)
|
||||
add_subdirectory(libcaption)
|
||||
add_subdirectory(opts-parser)
|
||||
|
|
|
@ -21,7 +21,7 @@ if(NOT TARGET OBS::media-playback)
|
|||
endif()
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/opts-parser" "${CMAKE_BINARY_DIR}/deps/opts-parser")
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
|
||||
endif()
|
||||
|
||||
if(OS_WINDOWS)
|
||||
|
|
|
@ -21,6 +21,10 @@ if(NOT TARGET OBS::media-playback)
|
|||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/media-playback" "${CMAKE_BINARY_DIR}/shared/media-playback")
|
||||
endif()
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
|
||||
endif()
|
||||
|
||||
add_subdirectory(ffmpeg-mux)
|
||||
if(ENABLE_NEW_MPEGTS_OUTPUT)
|
||||
find_package(Librist QUIET)
|
||||
|
|
|
@ -9,6 +9,10 @@ if(NOT TARGET happy-eyeballs)
|
|||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs")
|
||||
endif()
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
|
||||
endif()
|
||||
|
||||
add_library(obs-outputs MODULE)
|
||||
add_library(OBS::outputs ALIAS obs-outputs)
|
||||
|
||||
|
|
|
@ -17,6 +17,10 @@ if(NOT TARGET happy-eyeballs)
|
|||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/happy-eyeballs" "${CMAKE_BINARY_DIR}/shared/happy-eyeballs")
|
||||
endif()
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
|
||||
endif()
|
||||
|
||||
target_sources(
|
||||
obs-outputs
|
||||
PRIVATE obs-outputs.c
|
||||
|
|
|
@ -5,7 +5,7 @@ legacy_check()
|
|||
find_package(Libx264 REQUIRED)
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/deps/opts-parser" "${CMAKE_BINARY_DIR}/deps/opts-parser")
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
|
||||
endif()
|
||||
|
||||
add_library(obs-x264 MODULE)
|
||||
|
|
|
@ -6,6 +6,10 @@ add_library(obs-x264 MODULE)
|
|||
add_library(OBS::x264 ALIAS obs-x264)
|
||||
add_executable(obs-x264-test)
|
||||
|
||||
if(NOT TARGET OBS::opts-parser)
|
||||
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/opts-parser" "${CMAKE_BINARY_DIR}/shared/opts-parser")
|
||||
endif()
|
||||
|
||||
target_sources(obs-x264-test PRIVATE obs-x264-test.c)
|
||||
|
||||
target_link_libraries(obs-x264-test PRIVATE OBS::opts-parser)
|
||||
|
|
Loading…
Reference in a new issue