From 42670ab4e3d48d37bb9926f4d8b3b3b0dcfd0a62 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Wed, 2 Oct 2024 12:35:38 +0200 Subject: [PATCH] plugins/test: Remove legacy CMake remnants Some legacy files were missed in 72428ccd97ae032825fb3b390c0b2b50768655bf --- .../obs-ffmpeg/ffmpeg-mux/cmake/legacy.cmake | 23 ------------------ .../obs-amf-test/cmake/legacy.cmake | 14 ----------- .../obs-qsv11/obs-qsv-test/cmake/legacy.cmake | 15 ------------ test/test-input/cmake/legacy.cmake | 24 ------------------- 4 files changed, 76 deletions(-) delete mode 100644 plugins/obs-ffmpeg/ffmpeg-mux/cmake/legacy.cmake delete mode 100644 plugins/obs-ffmpeg/obs-amf-test/cmake/legacy.cmake delete mode 100644 plugins/obs-qsv11/obs-qsv-test/cmake/legacy.cmake delete mode 100644 test/test-input/cmake/legacy.cmake diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/cmake/legacy.cmake b/plugins/obs-ffmpeg/ffmpeg-mux/cmake/legacy.cmake deleted file mode 100644 index 469f57525..000000000 --- a/plugins/obs-ffmpeg/ffmpeg-mux/cmake/legacy.cmake +++ /dev/null @@ -1,23 +0,0 @@ -project(obs-ffmpeg-mux) - -option(ENABLE_FFMPEG_MUX_DEBUG "Enable FFmpeg-mux debugging" OFF) - -find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat) - -add_executable(obs-ffmpeg-mux) -add_executable(OBS::ffmpeg-mux ALIAS obs-ffmpeg-mux) - -target_sources(obs-ffmpeg-mux PRIVATE ffmpeg-mux.c ffmpeg-mux.h) - -target_link_libraries(obs-ffmpeg-mux PRIVATE OBS::libobs FFmpeg::avcodec FFmpeg::avutil FFmpeg::avformat) -if(OS_WINDOWS) - target_link_libraries(obs-ffmpeg-mux PRIVATE OBS::w32-pthreads) -endif() - -if(ENABLE_FFMPEG_MUX_DEBUG) - target_compile_definitions(obs-ffmpeg-mux PRIVATE ENABLE_FFMPEG_MUX_DEBUG) -endif() - -set_target_properties(obs-ffmpeg-mux PROPERTIES FOLDER "plugins/obs-ffmpeg") - -setup_binary_target(obs-ffmpeg-mux) diff --git a/plugins/obs-ffmpeg/obs-amf-test/cmake/legacy.cmake b/plugins/obs-ffmpeg/obs-amf-test/cmake/legacy.cmake deleted file mode 100644 index e00cef1cf..000000000 --- a/plugins/obs-ffmpeg/obs-amf-test/cmake/legacy.cmake +++ /dev/null @@ -1,14 +0,0 @@ -project(obs-amf-test) - -add_executable(obs-amf-test) - -find_package(AMF 1.4.29 REQUIRED) - -target_include_directories(obs-amf-test PRIVATE ${CMAKE_SOURCE_DIR}/libobs) - -target_sources(obs-amf-test PRIVATE obs-amf-test.cpp) -target_link_libraries(obs-amf-test d3d11 dxgi dxguid AMF::AMF) - -set_target_properties(obs-amf-test PROPERTIES FOLDER "plugins/obs-ffmpeg") - -setup_binary_target(obs-amf-test) diff --git a/plugins/obs-qsv11/obs-qsv-test/cmake/legacy.cmake b/plugins/obs-qsv11/obs-qsv-test/cmake/legacy.cmake deleted file mode 100644 index 7a842128a..000000000 --- a/plugins/obs-qsv11/obs-qsv-test/cmake/legacy.cmake +++ /dev/null @@ -1,15 +0,0 @@ -project(obs-qsv-test) - -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/libobs) - -add_executable(obs-qsv-test) - -find_package(VPL 2.6 REQUIRED) - -target_sources(obs-qsv-test PRIVATE obs-qsv-test.cpp) -target_link_libraries(obs-qsv-test d3d11 dxgi dxguid VPL::VPL) -target_link_options(obs-qsv-test PRIVATE /IGNORE:4099) - -set_target_properties(obs-qsv-test PROPERTIES FOLDER "plugins/obs-qsv11") - -setup_binary_target(obs-qsv-test) diff --git a/test/test-input/cmake/legacy.cmake b/test/test-input/cmake/legacy.cmake deleted file mode 100644 index 24e75544b..000000000 --- a/test/test-input/cmake/legacy.cmake +++ /dev/null @@ -1,24 +0,0 @@ -project(test-input) - -add_library(test-input MODULE) - -target_sources( - test-input - PRIVATE test-filter.c - test-input.c - test-sinewave.c - sync-async-source.c - sync-audio-buffering.c - sync-pair-vid.c - sync-pair-aud.c - test-random.c) - -target_link_libraries(test-input PRIVATE OBS::libobs) - -if(MSVC) - target_link_libraries(test-input PRIVATE OBS::w32-pthreads) -endif() - -set_target_properties(test-input PROPERTIES FOLDER "tests and examples") - -setup_plugin_target(test-input)