From ce0d1234ccd63dbe29439f0645b8eab00da0f2f7 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Mon, 11 Oct 2021 12:33:07 +0300 Subject: [PATCH] Add missing WITH_FFMPEG option --- CMakeModules/nel.cmake | 2 ++ nel/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeModules/nel.cmake b/CMakeModules/nel.cmake index f8d01a0bc..baddcfa9b 100644 --- a/CMakeModules/nel.cmake +++ b/CMakeModules/nel.cmake @@ -249,6 +249,8 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) OPTION(WITH_ASSIMP "Use assimp exporter" OFF) OPTION(WITH_LIBGSF "Use libgsf for max file library" OFF) + OPTION(WITH_FFMPEG "Use ffmpeg for audio decoder" OFF) + ### # GUI toolkits ### diff --git a/nel/CMakeLists.txt b/nel/CMakeLists.txt index 1530e75e3..b102310ab 100644 --- a/nel/CMakeLists.txt +++ b/nel/CMakeLists.txt @@ -20,7 +20,9 @@ ENDIF() IF(WITH_SOUND) FIND_PACKAGE(Ogg) FIND_PACKAGE(Vorbis) - FIND_PACKAGE(FFmpeg COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE) + IF(WITH_FFMPEG) + FIND_PACKAGE(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE) + ENDIF() IF(WITH_DRIVER_OPENAL) FIND_PACKAGE(OpenAL)