From e53293a7851f00d5df8dd878fab8eb3f73064ad0 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Tue, 18 Mar 2025 12:50:26 +0100 Subject: [PATCH] cmake: Use Extra CMake Modules on Linux --- .cirrus.yml | 2 +- .github/scripts/utils.zsh/setup_ubuntu | 2 +- cmake/linux/defaults.cmake | 1 + cmake/linux/ecmconfig.cmake | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 cmake/linux/ecmconfig.cmake diff --git a/.cirrus.yml b/.cirrus.yml index 73a493341..34f99a75e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ env: task: install_script: - 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 alsa-lib pipewire v4l_compat libpci librist srt nlohmann-json uthash qr-code-generator websocketpp asio vlc swig luajit jackit sndio fdk-aac diff --git a/.github/scripts/utils.zsh/setup_ubuntu b/.github/scripts/utils.zsh/setup_ubuntu index a4e7a6515..4833fc1fc 100644 --- a/.github/scripts/utils.zsh/setup_ubuntu +++ b/.github/scripts/utils.zsh/setup_ubuntu @@ -60,7 +60,7 @@ log_group 'Installing obs-studio build dependencies from apt...' sudo apt-get install -y --no-install-recommends \ build-essential libglib2.0-dev \ - lsb-release dh-cmake \ + extra-cmake-modules lsb-release dh-cmake \ libcurl4-openssl-dev \ libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev \ libswresample-dev libswscale-dev \ diff --git a/cmake/linux/defaults.cmake b/cmake/linux/defaults.cmake index 17c3c890c..b6a0061ff 100644 --- a/cmake/linux/defaults.cmake +++ b/cmake/linux/defaults.cmake @@ -40,3 +40,4 @@ set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE) include(cpackconfig) +include(ecmconfig) diff --git a/cmake/linux/ecmconfig.cmake b/cmake/linux/ecmconfig.cmake new file mode 100644 index 000000000..2323b6592 --- /dev/null +++ b/cmake/linux/ecmconfig.cmake @@ -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})