Merge 1f0bf4c7fd into 59a51e440c

CMakeLists.txt

@@ -93,6 +93,7 @@ endif()
 
 # libwavpack
 
+if (BUILD_LIBWAVPACK)
     project(libwavpack)
 
     if(MSVC)
@@ -160,6 +161,7 @@ install(TARGETS libwavpack
             RUNTIME DESTINATION bin)
 
     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