diff --git a/plugins/win-capture/get-graphics-offsets/CMakeLists.txt b/plugins/win-capture/get-graphics-offsets/CMakeLists.txt index 94bd92007..8e0bbb92d 100644 --- a/plugins/win-capture/get-graphics-offsets/CMakeLists.txt +++ b/plugins/win-capture/get-graphics-offsets/CMakeLists.txt @@ -20,8 +20,6 @@ target_link_libraries(get-graphics-offsets d3d9.lib dxgi.lib d3d11.lib) if(MSVC) target_compile_options(get-graphics-offsets PRIVATE "$,/MTd,/MT>") - add_target_resource(win-capture "$" - "obs-plugins/win-capture/" OPTIONAL) endif() set_target_properties(get-graphics-offsets PROPERTIES FOLDER @@ -32,7 +30,7 @@ set_target_properties( "get-graphics-offsets$,64,32>" ) -add_target_resource(win-capture "$" - "obs-plugins/win-capture/") +set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/") +setup_plugin_target(get-graphics-offsets) add_dependencies(win-capture get-graphics-offsets) diff --git a/plugins/win-capture/graphics-hook/CMakeLists.txt b/plugins/win-capture/graphics-hook/CMakeLists.txt index 5f1853e5f..0e37aa4f1 100644 --- a/plugins/win-capture/graphics-hook/CMakeLists.txt +++ b/plugins/win-capture/graphics-hook/CMakeLists.txt @@ -34,8 +34,6 @@ target_link_options(graphics-hook PRIVATE "LINKER:/IGNORE:4099") if(MSVC) target_compile_options(graphics-hook PRIVATE "$,/MTd,/MT>") - add_target_resource(win-capture "$" - "obs-plugins/win-capture/" OPTIONAL) endif() set_target_properties( @@ -54,14 +52,14 @@ if(TARGET Vulkan::Vulkan) target_compile_definitions(graphics-hook PRIVATE COMPILE_VULKAN_HOOK) add_target_resource( - win-capture "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan64.json" + graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan64.json" "obs-plugins/win-capture/") add_target_resource( - win-capture "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan32.json" + graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan32.json" "obs-plugins/win-capture/") endif() -add_target_resource(win-capture "$" - "obs-plugins/win-capture/") +set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/") +setup_plugin_target(graphics-hook) add_dependencies(win-capture graphics-hook) diff --git a/plugins/win-capture/inject-helper/CMakeLists.txt b/plugins/win-capture/inject-helper/CMakeLists.txt index 80f8435fc..aa877fff8 100644 --- a/plugins/win-capture/inject-helper/CMakeLists.txt +++ b/plugins/win-capture/inject-helper/CMakeLists.txt @@ -10,8 +10,6 @@ target_include_directories(inject-helper PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) if(MSVC) target_compile_options(inject-helper PRIVATE "$,/MTd,/MT>") - add_target_resource(win-capture "$" - "obs-plugins/win-capture/" OPTIONAL) endif() set_target_properties( @@ -20,7 +18,7 @@ set_target_properties( OUTPUT_NAME "inject-helper$,64,32>") -add_target_resource(win-capture "$" - "obs-plugins/win-capture/") +set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/") +setup_plugin_target(inject-helper) add_dependencies(win-capture inject-helper)