starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-24 02:34:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Use Extra CMake Modules on Linux

Browse Source
This commit is contained in:
tytan652
2025-04-28 13:30:26 -04:00
committed by Ryan Foster
parent 1643470a85
commit e53293a785
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cirrus.yml
+1 -1
View File
@@ -10,7 +10,7 @@ env:
task: task:
install_script: install_script:
- pkg install -y - pkg install -y
cmake ninja binutils pkgconf curl cmake ninja binutils pkgconf curl kf6-extra-cmake-modules
ffmpeg qt6-base qt6-svg jansson libsysinfo e2fsprogs-libuuid pulseaudio ffmpeg qt6-base qt6-svg jansson libsysinfo e2fsprogs-libuuid pulseaudio
alsa-lib pipewire v4l_compat libpci librist srt nlohmann-json uthash alsa-lib pipewire v4l_compat libpci librist srt nlohmann-json uthash
qr-code-generator websocketpp asio vlc swig luajit jackit sndio fdk-aac qr-code-generator websocketpp asio vlc swig luajit jackit sndio fdk-aac
.github/scripts/utils.zsh/setup_ubuntu
+1 -1
View File
@@ -60,7 +60,7 @@ log_group 'Installing obs-studio build dependencies from apt...'
sudo apt-get install -y --no-install-recommends \ sudo apt-get install -y --no-install-recommends \
build-essential libglib2.0-dev \ build-essential libglib2.0-dev \
lsb-release dh-cmake \ extra-cmake-modules lsb-release dh-cmake \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev \ libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev \
libswresample-dev libswscale-dev \ libswresample-dev libswscale-dev \
cmake/linux/defaults.cmake
+1
View File
@@ -40,3 +40,4 @@ set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE) set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE)
include(cpackconfig) include(cpackconfig)
include(ecmconfig)
cmake/linux/ecmconfig.cmake
+7
View File
@@ -0,0 +1,7 @@
# OBS CMake Linux Extra CMake Module configuration module
include_guard(GLOBAL)
find_package(ECM REQUIRED NO_MODULE)
list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})