Преглед изворни кода

cmake: Fix enabling PulseAudio monitoring

Also adds a warning if null monitoring is "enabled".
tytan652 пре 3 година
родитељ
комит
9a33e49087
3 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 0
      CMakeLists.txt
  2. 1 0
      libobs/CMakeLists.txt
  3. 0 2
      plugins/linux-pulseaudio/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -59,6 +59,7 @@ elseif(OS_MACOS)
 elseif(OS_POSIX)
 elseif(OS_POSIX)
   option(LINUX_PORTABLE "Build portable version (Linux)" OFF)
   option(LINUX_PORTABLE "Build portable version (Linux)" OFF)
   option(USE_XDG "Utilize XDG Base Directory Specification (Linux)" ON)
   option(USE_XDG "Utilize XDG Base Directory Specification (Linux)" ON)
+  option(ENABLE_PULSEAUDIO "Enable PulseAudio support" ON)
   if(OS_LINUX)
   if(OS_LINUX)
     option(ENABLE_WAYLAND "Enable building with support for Wayland (Linux)" ON)
     option(ENABLE_WAYLAND "Enable building with support for Wayland (Linux)" ON)
     option(BUILD_FOR_PPA "Build for PPA distribution" OFF)
     option(BUILD_FOR_PPA "Build for PPA distribution" OFF)

+ 1 - 0
libobs/CMakeLists.txt

@@ -399,6 +399,7 @@ elseif(OS_POSIX)
 
 
     target_link_libraries(libobs PRIVATE ${PULSEAUDIO_LIBRARY})
     target_link_libraries(libobs PRIVATE ${PULSEAUDIO_LIBRARY})
   else()
   else()
+    obs_status(WARNING "-> No audio backend found - audio monitoring disabled")
     target_sources(libobs PRIVATE audio-monitoring/null/null-audio-monitoring.c)
     target_sources(libobs PRIVATE audio-monitoring/null/null-audio-monitoring.c)
   endif()
   endif()
 
 

+ 0 - 2
plugins/linux-pulseaudio/CMakeLists.txt

@@ -1,7 +1,5 @@
 project(linux-pulseaudio)
 project(linux-pulseaudio)
 
 
-option(ENABLE_PULSEAUDIO "Enable PulseAudio support" ON)
-
 if(NOT ENABLE_PULSEAUDIO)
 if(NOT ENABLE_PULSEAUDIO)
   obs_status(DISABLED "linux-pulseaudio")
   obs_status(DISABLED "linux-pulseaudio")
   return()
   return()