diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index 885e3064334038..9260997de27f8e 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -459,7 +459,7 @@ macro(install_obs_datatarget target datadest) endif() endmacro() -macro(install_obs_plugin_data target datadir) +macro(install_obs_plugin_with_data target datadir) install_obs_plugin(${target}) install_obs_data(${target} "${datadir}" "obs-plugins/${target}") endmacro() diff --git a/plugins/image-source/CMakeLists.txt b/plugins/image-source/CMakeLists.txt index 1b49a96212233f..9966d04d5e7d64 100644 --- a/plugins/image-source/CMakeLists.txt +++ b/plugins/image-source/CMakeLists.txt @@ -8,5 +8,4 @@ add_library(image-source MODULE target_link_libraries(image-source libobs) -install_obs_plugin(image-source) -install_obs_plugin_data(image-source data) +install_obs_plugin_with_data(image-source data) diff --git a/plugins/linux-pulseaudio/CMakeLists.txt b/plugins/linux-pulseaudio/CMakeLists.txt index ff08f09c8a56dd..8f36d79b4d196a 100644 --- a/plugins/linux-pulseaudio/CMakeLists.txt +++ b/plugins/linux-pulseaudio/CMakeLists.txt @@ -22,5 +22,4 @@ target_link_libraries(linux-pulseaudio ${PULSEAUDIO_LIBRARY} ) -install_obs_plugin(linux-pulseaudio) -install_obs_plugin_data(linux-pulseaudio data) +install_obs_plugin_with_data(linux-pulseaudio data) diff --git a/plugins/linux-v4l2/CMakeLists.txt b/plugins/linux-v4l2/CMakeLists.txt index ba84ab71de212b..4c1f0e4da59f7a 100644 --- a/plugins/linux-v4l2/CMakeLists.txt +++ b/plugins/linux-v4l2/CMakeLists.txt @@ -22,5 +22,4 @@ target_link_libraries(linux-v4l2 ${LIBV4L2_LIBRARIES} ) -install_obs_plugin(linux-v4l2) -install_obs_plugin_data(linux-v4l2 data) +install_obs_plugin_with_data(linux-v4l2 data) diff --git a/plugins/linux-xcomposite/CMakeLists.txt b/plugins/linux-xcomposite/CMakeLists.txt index e9048bda92e725..eff767c45a04f3 100644 --- a/plugins/linux-xcomposite/CMakeLists.txt +++ b/plugins/linux-xcomposite/CMakeLists.txt @@ -25,5 +25,4 @@ target_link_libraries(linux-xcomposite ${X11_X11_LIB} ${X11_Xcomposite_LIB}) -install_obs_plugin(linux-xcomposite) -install_obs_plugin_data(linux-xcomposite data) +install_obs_plugin_with_data(linux-xcomposite data) diff --git a/plugins/linux-xshm/CMakeLists.txt b/plugins/linux-xshm/CMakeLists.txt index 7db2bc200a5d0c..1ca91557b16050 100644 --- a/plugins/linux-xshm/CMakeLists.txt +++ b/plugins/linux-xshm/CMakeLists.txt @@ -27,5 +27,4 @@ target_link_libraries(linux-xshm ${X11_Xinerama_LIB} ) -install_obs_plugin(linux-xshm) -install_obs_plugin_data(linux-xshm data) +install_obs_plugin_with_data(linux-xshm data) diff --git a/plugins/mac-avcapture/CMakeLists.txt b/plugins/mac-avcapture/CMakeLists.txt index 8049b5512f3f4d..e84ae2906cea4a 100644 --- a/plugins/mac-avcapture/CMakeLists.txt +++ b/plugins/mac-avcapture/CMakeLists.txt @@ -37,5 +37,4 @@ target_link_libraries(mac-avcapture ${COREVIDEO} ${COCOA}) -install_obs_plugin(mac-avcapture) -install_obs_plugin_data(mac-avcapture data) +install_obs_plugin_with_data(mac-avcapture data) diff --git a/plugins/mac-capture/CMakeLists.txt b/plugins/mac-capture/CMakeLists.txt index e9c511f1036594..73f321a7728a36 100644 --- a/plugins/mac-capture/CMakeLists.txt +++ b/plugins/mac-capture/CMakeLists.txt @@ -36,5 +36,4 @@ target_link_libraries(mac-capture ${IOSURF} ${COCOA}) -install_obs_plugin(mac-capture) -install_obs_plugin_data(mac-capture data) +install_obs_plugin_with_data(mac-capture data) diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt index 03b6fbc07611ac..cde8d16329009e 100644 --- a/plugins/obs-ffmpeg/CMakeLists.txt +++ b/plugins/obs-ffmpeg/CMakeLists.txt @@ -45,5 +45,4 @@ target_link_libraries(obs-ffmpeg ${LIBAVFORMAT_LIBRARIES} ${LIBSWRESAMPLE_LIBRARIES}) -install_obs_plugin(obs-ffmpeg) -install_obs_plugin_data(obs-ffmpeg data) +install_obs_plugin_with_data(obs-ffmpeg data) diff --git a/plugins/obs-libfdk/CMakeLists.txt b/plugins/obs-libfdk/CMakeLists.txt index f6c39d31317f1a..1b260e1398ae65 100644 --- a/plugins/obs-libfdk/CMakeLists.txt +++ b/plugins/obs-libfdk/CMakeLists.txt @@ -18,5 +18,4 @@ target_link_libraries(obs-libfdk libobs ${LIBFDK_LIBRARIES}) -install_obs_plugin(obs-libfdk) -install_obs_plugin_data(obs-libfdk data) +install_obs_plugin_with_data(obs-libfdk data) diff --git a/plugins/obs-outputs/CMakeLists.txt b/plugins/obs-outputs/CMakeLists.txt index ad943b2677fe32..72264b86b57bc0 100644 --- a/plugins/obs-outputs/CMakeLists.txt +++ b/plugins/obs-outputs/CMakeLists.txt @@ -54,5 +54,4 @@ target_link_libraries(obs-outputs libobs ${obs-outputs_PLATFORM_DEPS}) -install_obs_plugin(obs-outputs) -install_obs_plugin_data(obs-outputs data) +install_obs_plugin_with_data(obs-outputs data) diff --git a/plugins/obs-x264/CMakeLists.txt b/plugins/obs-x264/CMakeLists.txt index a05c6941f24907..7d4ea8b3dba805 100644 --- a/plugins/obs-x264/CMakeLists.txt +++ b/plugins/obs-x264/CMakeLists.txt @@ -14,5 +14,4 @@ target_link_libraries(obs-x264 libobs ${LIBX264_LIBRARIES}) -install_obs_plugin(obs-x264) -install_obs_plugin_data(obs-x264 data) +install_obs_plugin_with_data(obs-x264 data) diff --git a/plugins/rtmp-services/CMakeLists.txt b/plugins/rtmp-services/CMakeLists.txt index 508a5ed8f3cbbb..5abcb571a9f5ba 100644 --- a/plugins/rtmp-services/CMakeLists.txt +++ b/plugins/rtmp-services/CMakeLists.txt @@ -13,5 +13,4 @@ target_link_libraries(rtmp-services libobs ${OBS_JANSSON_IMPORT}) -install_obs_plugin(rtmp-services) -install_obs_plugin_data(rtmp-services data) +install_obs_plugin_with_data(rtmp-services data) diff --git a/plugins/text-freetype2/CMakeLists.txt b/plugins/text-freetype2/CMakeLists.txt index f78f0fc240ff44..f8966abf7ab81d 100644 --- a/plugins/text-freetype2/CMakeLists.txt +++ b/plugins/text-freetype2/CMakeLists.txt @@ -70,5 +70,4 @@ if(UNIX AND LIBICONV_FOUND) target_link_libraries(text-freetype2 ${LIBICONV_LIBRARIES}) endif() -install_obs_plugin(text-freetype2) -install_obs_plugin_data(text-freetype2 data) +install_obs_plugin_with_data(text-freetype2 data) diff --git a/plugins/win-capture/CMakeLists.txt b/plugins/win-capture/CMakeLists.txt index c2529862b1bc7b..eb35b93b29a7f2 100644 --- a/plugins/win-capture/CMakeLists.txt +++ b/plugins/win-capture/CMakeLists.txt @@ -16,5 +16,4 @@ target_link_libraries(win-capture libobs psapi.lib) -install_obs_plugin(win-capture) -install_obs_plugin_data(win-capture data) +install_obs_plugin_with_data(win-capture data) diff --git a/plugins/win-dshow/CMakeLists.txt b/plugins/win-dshow/CMakeLists.txt index 36577978b0d991..a8829d61afbeb8 100644 --- a/plugins/win-dshow/CMakeLists.txt +++ b/plugins/win-dshow/CMakeLists.txt @@ -31,5 +31,4 @@ target_link_libraries(win-dshow libobs strmiids.lib) -install_obs_plugin(win-dshow) -install_obs_plugin_data(win-dshow data) +install_obs_plugin_with_data(win-dshow data) diff --git a/plugins/win-wasapi/CMakeLists.txt b/plugins/win-wasapi/CMakeLists.txt index d67d956c89639f..04a0751dad2e2d 100644 --- a/plugins/win-wasapi/CMakeLists.txt +++ b/plugins/win-wasapi/CMakeLists.txt @@ -14,5 +14,4 @@ add_library(win-wasapi MODULE target_link_libraries(win-wasapi libobs) -install_obs_plugin(win-wasapi) -install_obs_plugin_data(win-wasapi data) +install_obs_plugin_with_data(win-wasapi data) diff --git a/test/test-input/CMakeLists.txt b/test/test-input/CMakeLists.txt index 9cfef0ca750af3..a8eaf433e6e9bf 100644 --- a/test/test-input/CMakeLists.txt +++ b/test/test-input/CMakeLists.txt @@ -21,4 +21,4 @@ target_link_libraries(test-input ${test-input_PLATFORM_DEPS} libobs) -install_obs_plugin_data(test-input data) +install_obs_plugin_with_data(test-input data)