From cbd21590cedbe41cd8e081ad96daeef6bf39580d Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 14 Feb 2022 11:35:19 +0100 Subject: [PATCH] Make pulse header required --- indra/cmake/MediaPluginBase.cmake | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/indra/cmake/MediaPluginBase.cmake b/indra/cmake/MediaPluginBase.cmake index cde56fb5e4..17890c25fd 100644 --- a/indra/cmake/MediaPluginBase.cmake +++ b/indra/cmake/MediaPluginBase.cmake @@ -6,24 +6,18 @@ if (LINUX) include_directories( ${GLIB_INCLUDE_DIRS} ) - set( PULSE_AUDIO True ) foreach( PULSE_FILE pulse/introspect.h pulse/context.h pulse/subscribe.h pulse/glib-mainloop.h ) - find_path( PULSE_FILE_FOUND ${PULSE_FILE} NO_CACHE) - if( NOT PULSE_FILE_FOUND ) + find_path( PULSE_FILE_${PULSE_FILE}_FOUND ${PULSE_FILE} NO_CACHE) + if( NOT PULSE_FILE_${PULSE_FILE}_FOUND ) message( "Looking for ${PULSE_FILE} ... not found") - set( PULSE_AUDIO False ) + message( FATAL_ERROR "Pulse header not found" ) else() message( "Looking for ${PULSE_FILE} ... found") endif() endforeach() - if( NOT PULSE_AUDIO ) - message( "Building without linux volume catcher" ) - set(LINUX_VOLUME_CATCHER dummy_volume_catcher.cpp) - else() - message( "Building with linux volume catcher" ) - set(LINUX_VOLUME_CATCHER linux_volume_catcher.cpp) - endif() + message( "Building with linux volume catcher" ) + set(LINUX_VOLUME_CATCHER linux_volume_catcher.cpp) endif()