소스 검색

deps,shared,plugins: Move opts-parser to shared folder

tytan652 2 년 전
부모
커밋
2a53015ad7

+ 0 - 1
deps/CMakeLists.txt

@@ -5,4 +5,3 @@ endif()
 add_subdirectory(blake2)
 add_subdirectory(glad)
 add_subdirectory(libcaption)
-add_subdirectory(opts-parser)

+ 1 - 1
plugins/obs-ffmpeg/cmake/dependencies.cmake

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

+ 4 - 0
plugins/obs-ffmpeg/cmake/legacy.cmake

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

+ 4 - 0
plugins/obs-outputs/CMakeLists.txt

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

+ 4 - 0
plugins/obs-outputs/cmake/legacy.cmake

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

+ 1 - 1
plugins/obs-x264/CMakeLists.txt

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

+ 4 - 0
plugins/obs-x264/cmake/legacy.cmake

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

+ 0 - 0
deps/opts-parser/CMakeLists.txt → shared/opts-parser/CMakeLists.txt


+ 0 - 0
deps/opts-parser/opts-parser.c → shared/opts-parser/opts-parser.c


+ 0 - 0
deps/opts-parser/opts-parser.h → shared/opts-parser/opts-parser.h