make libwavpack build optional

CMakeLists.txt

@@ -93,9 +93,10 @@ endif()
 
 # libwavpack
 
-project(libwavpack)
+if (BUILD_LIBWAVPACK)
+    project(libwavpack)
 
-if(MSVC)
+    if(MSVC)
         # Disable warning C4996 regarding fopen(), strcpy(), etc.
         _add_define("_CRT_SECURE_NO_WARNINGS")
 
@@ -106,19 +107,19 @@ if(MSVC)
         # Make sure WinDef.h does not define min and max macros which
         # will conflict with std::min() and std::max().
         _add_define("NOMINMAX")
-endif()
+    endif()
 
-add_definitions(${_NQR_CXX_DEFINITIONS})
-set(CMAKE_CXX_FLAGS "${_NQR_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
+    add_definitions(${_NQR_CXX_DEFINITIONS})
+    set(CMAKE_CXX_FLAGS "${_NQR_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 
-file(GLOB third_wavpack_src "${LIBNYQUIST_ROOT}/third_party/wavpack/src/*")
+    file(GLOB third_wavpack_src "${LIBNYQUIST_ROOT}/third_party/wavpack/src/*")
 
-add_library(libwavpack STATIC ${third_wavpack_src})
+    add_library(libwavpack STATIC ${third_wavpack_src})
 
-set_cxx_version(libwavpack)
-_set_compile_options(libwavpack)
+    set_cxx_version(libwavpack)
+    _set_compile_options(libwavpack)
 
-if (WIN32)
+    if (WIN32)
         _disable_warning(181)
         _disable_warning(111)
         _disable_warning(4267)
@@ -137,29 +138,30 @@ if (WIN32)
         _disable_warning(4013)
         _disable_warning(4334)
         _disable_warning(4703)
-endif()
+    endif()
 
-target_include_directories(libwavpack PRIVATE ${LIBNYQUIST_ROOT}/third_party/wavpack/include)
+    target_include_directories(libwavpack PRIVATE ${LIBNYQUIST_ROOT}/third_party/wavpack/include)
 
-if (MSVC_IDE)
+    if (MSVC_IDE)
         set_target_properties(libwavpack PROPERTIES IMPORT_PREFIX "../")
-endif()
+    endif()
 
-set_target_properties(libwavpack
+    set_target_properties(libwavpack
         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(libwavpack PROPERTIES OUTPUT_NAME_DEBUG libwavpack_d)
+    set_target_properties(libwavpack PROPERTIES OUTPUT_NAME_DEBUG libwavpack_d)
 
-install(TARGETS libwavpack
+    install(TARGETS libwavpack
             LIBRARY DESTINATION lib
             ARCHIVE DESTINATION lib
             RUNTIME DESTINATION bin)
 
-install (TARGETS libwavpack DESTINATION lib)
+    install (TARGETS libwavpack DESTINATION lib)
+endif()
 
 #-------------------------------------------------------------------------------
 
@@ -174,6 +176,7 @@ file(GLOB wavpack_src     "${LIBNYQUIST_ROOT}/third_party/wavpack/src/*")
 add_library(libnyquist STATIC
     ${nyquist_include}
     ${nyquist_src}
+    ${wavpack_src}
 )
 
 set_cxx_version(libnyquist)
@@ -221,7 +224,7 @@ set_target_properties(libnyquist
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
 )
 
-target_link_libraries(libnyquist PRIVATE libwavpack)
+#target_link_libraries(libnyquist PRIVATE libwavpack)
 
 install(TARGETS libnyquist
         LIBRARY DESTINATION lib