Add missing WITH_FFMPEG option

3 years ago · ce0d1234cc
parent ea6e4d91c3
commit ce0d1234cc
2 changed files with 5 additions and 1 deletions
--- 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
  ###
--- 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)