jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double invocation of install_obs_plugin in every single plugin

master
BtbN 2014-08-19 14:24:59 +02:00
parent 7eee45fb7f
commit 02725acdd4
18 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/ObsHelpers.cmake
View File

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

3
plugins/image-source/CMakeLists.txt
View File

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

3
plugins/linux-pulseaudio/CMakeLists.txt
View File

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

3
plugins/linux-v4l2/CMakeLists.txt
View File

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

3
plugins/linux-xcomposite/CMakeLists.txt
View File

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

3
plugins/linux-xshm/CMakeLists.txt
View File

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

3
plugins/mac-avcapture/CMakeLists.txt
View File

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

3
plugins/mac-capture/CMakeLists.txt
View File

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

3
plugins/obs-ffmpeg/CMakeLists.txt
View File

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

3
plugins/obs-libfdk/CMakeLists.txt
View File

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

3
plugins/obs-outputs/CMakeLists.txt
View File

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

3
plugins/obs-x264/CMakeLists.txt
View File

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

3
plugins/rtmp-services/CMakeLists.txt
View File

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

3
plugins/text-freetype2/CMakeLists.txt
View File

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

3
plugins/win-capture/CMakeLists.txt
View File

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

3
plugins/win-dshow/CMakeLists.txt
View File

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

3
plugins/win-wasapi/CMakeLists.txt
View File

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

2
test/test-input/CMakeLists.txt
View File

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