Make libopus build optional, as libopus is built statically into libnyquist already

CMakeLists.txt

@@ -20,15 +20,16 @@ endif()
 
 # libopus
 
-project(libopus)
+if (BUILD_LIBOPUS)
+    project(libopus)
 
-file(GLOB third_opus_src
+    file(GLOB third_opus_src
         "${LIBNYQUIST_ROOT}/third_party/opus/celt/*.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/opusfile/src/*.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/silk/*.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/silk/float/*.c"
-)
+    )
-set(lib_opus_src
+    set(lib_opus_src
         "${LIBNYQUIST_ROOT}/third_party/opus/libopus/src/analysis.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/libopus/src/mlp_data.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/libopus/src/mlp.c"
@@ -37,19 +38,19 @@ set(lib_opus_src
         "${LIBNYQUIST_ROOT}/third_party/opus/libopus/src/opus_multistream_encoder.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/libopus/src/opus.c"
         "${LIBNYQUIST_ROOT}/third_party/opus/libopus/src/repacketizer.c"
-)
+    )
 
-add_library(libopus STATIC ${third_opus_src} ${lib_opus_src})
+    add_library(libopus STATIC ${third_opus_src} ${lib_opus_src})
 
-set_cxx_version(libopus)
+    set_cxx_version(libopus)
-_set_compile_options(libopus)
+    _set_compile_options(libopus)
 
-if (WIN32)
+    if (WIN32)
         _disable_warning(4244)
         _disable_warning(4018)
-endif()
+    endif()
 
-target_include_directories(libopus PRIVATE
+    target_include_directories(libopus PRIVATE
         ${LIBNYQUIST_ROOT}/third_party/libogg/include
         ${LIBNYQUIST_ROOT}/third_party/opus/celt
         ${LIBNYQUIST_ROOT}/third_party/opus/libopus/include
@@ -58,34 +59,35 @@ target_include_directories(libopus PRIVATE
         ${LIBNYQUIST_ROOT}/third_party/opus/silk
         ${LIBNYQUIST_ROOT}/third_party/opus/silk/float)
 
-if (MSVC_IDE)
+    if (MSVC_IDE)
         # hack to get around the "Debug" and "Release" directories cmake tries to add on Windows
         #set_target_properties(libnyquist PROPERTIES PREFIX "../")
         set_target_properties(libopus PROPERTIES IMPORT_PREFIX "../")
-endif()
+    endif()
 
-target_compile_definitions(libopus PRIVATE OPUS_BUILD)
+    target_compile_definitions(libopus PRIVATE OPUS_BUILD)
-target_compile_definitions(libopus PRIVATE USE_ALLOCA)
+    target_compile_definitions(libopus PRIVATE USE_ALLOCA)
 
-set_target_properties(libopus
+    set_target_properties(libopus
         PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
         ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
         RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-)
+    )
 
-set_target_properties(libopus PROPERTIES OUTPUT_NAME_DEBUG libopus_d)
+    set_target_properties(libopus PROPERTIES OUTPUT_NAME_DEBUG libopus_d)
 
-install (TARGETS libopus
+    install (TARGETS libopus
              LIBRARY DESTINATION lib
              ARCHIVE DESTINATION lib
              RUNTIME DESTINATION bin)
 
-install (TARGETS libopus DESTINATION lib)
+    install (TARGETS libopus DESTINATION lib)
 
-# folders
+    # folders
 
-source_group(src FILES ${third_opus_src})
+    source_group(src FILES ${third_opus_src})
+endif()
 
 #-------------------------------------------------------------------------------
 
@@ -219,7 +221,7 @@ set_target_properties(libnyquist
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )
 
-target_link_libraries(libnyquist PRIVATE libopus libwavpack)
+target_link_libraries(libnyquist PRIVATE libwavpack)
 
 install(TARGETS libnyquist
         LIBRARY DESTINATION lib