Eliminate the strict requirement of libsndfile

atsushieno · Oct 28, 2020 · d5aad58 · d5aad58
1 parent ff1d749
commit d5aad58
Show file tree

Hide file tree

Showing 11 changed files with 196 additions and 110 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,6 +29,7 @@ option (SFIZZ_BENCHMARKS        "Enable benchmarks build [default: OFF]" OFF)
 option (SFIZZ_TESTS             "Enable tests build [default: OFF]" OFF)
 option (SFIZZ_DEVTOOLS          "Enable developer tools build [default: OFF]" OFF)
 option (SFIZZ_SHARED            "Enable shared library build [default: ON]" ON)
+option (SFIZZ_USE_SNDFILE       "Enable use of the sndfile library [default: ON]" ON)
 option (SFIZZ_USE_VCPKG         "Assume that sfizz is build using vcpkg [default: OFF]" OFF)
 option (SFIZZ_STATIC_DEPENDENCIES "Link dependencies statically [default: OFF]" OFF)
 option (SFIZZ_RELEASE_ASSERTS   "Forced assertions in release builds [default: OFF]" OFF)

diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -86,7 +86,7 @@ sfizz_add_benchmark(bm_flacfile BM_flacfile.cpp)
 target_link_libraries(bm_flacfile PRIVATE sfizz-sndfile)
 
 sfizz_add_benchmark(bm_audioReaders BM_audioReaders.cpp ../src/sfizz/AudioReader.cpp)
-target_link_libraries(bm_audioReaders PRIVATE sfizz-sndfile)
+target_link_libraries(bm_audioReaders PRIVATE st_audiofile sfizz-sndfile)
 
 sfizz_add_benchmark(bm_readChunk BM_readChunk.cpp)
 target_link_libraries(bm_readChunk PRIVATE sfizz-sndfile)

diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake
@@ -79,30 +79,40 @@ function(sfizz_enable_fast_math NAME)
     endif()
 endfunction()
 
-# The sndfile library
-add_library(sfizz-sndfile INTERFACE)
-
 # The jsl utility library for C++
 add_library(sfizz-jsl INTERFACE)
 target_include_directories(sfizz-jsl INTERFACE "external/jsl/include")
 
-if (SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    find_package(SndFile CONFIG REQUIRED)
-    find_path(SNDFILE_INCLUDE_DIR sndfile.hh)
-    target_include_directories(sfizz-sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}")
-    target_link_libraries(sfizz-sndfile INTERFACE SndFile::sndfile)
-else()
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(SNDFILE "sndfile" REQUIRED)
-    target_include_directories(sfizz-sndfile INTERFACE ${SNDFILE_INCLUDE_DIRS})
-    if (SFIZZ_STATIC_DEPENDENCIES)
-        target_link_libraries(sfizz-sndfile INTERFACE ${SNDFILE_STATIC_LIBRARIES})
+# The sndfile library
+if (SFIZZ_USE_SNDFILE OR SFIZZ_TESTS OR SFIZZ_BENCHMARKS OR SFIZZ_RENDER)
+    add_library(sfizz-sndfile INTERFACE)
+    if (SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        find_package(SndFile CONFIG REQUIRED)
+        find_path(SNDFILE_INCLUDE_DIR "sndfile.hh")
+        target_include_directories(sfizz-sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}")
+        target_link_libraries(sfizz-sndfile INTERFACE SndFile::sndfile)
     else()
-        target_link_libraries(sfizz-sndfile INTERFACE ${SNDFILE_LIBRARIES})
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(SNDFILE "sndfile" REQUIRED)
+        target_include_directories(sfizz-sndfile INTERFACE ${SNDFILE_INCLUDE_DIRS})
+        if (SFIZZ_STATIC_DEPENDENCIES)
+            target_link_libraries(sfizz-sndfile INTERFACE ${SNDFILE_STATIC_LIBRARIES})
+        else()
+            target_link_libraries(sfizz-sndfile INTERFACE ${SNDFILE_LIBRARIES})
+        endif()
+        link_directories(${SNDFILE_LIBRARY_DIRS})
     endif()
-    link_directories(${SNDFILE_LIBRARY_DIRS})
 endif()
 
+# The st_audiofile library
+if (SFIZZ_USE_SNDFILE)
+    set(ST_AUDIO_FILE_USE_SNDFILE ON CACHE BOOL "" FORCE)
+    set(ST_AUDIO_FILE_EXTERNAL_SNDFILE "sfizz-sndfile" CACHE STRING ""  FORCE)
+else()
+    set(ST_AUDIO_FILE_USE_SNDFILE OFF CACHE BOOL "" FORCE)
+    set(ST_AUDIO_FILE_EXTERNAL_SNDFILE "" CACHE STRING ""  FORCE)
+endif()
+add_subdirectory("external/st_audiofile" EXCLUDE_FROM_ALL)
 
 # If we build with Clang, optionally use libc++. Enabled by default on Apple OS.
 cmake_dependent_option(USE_LIBCPP "Use libc++ with clang" "${APPLE}"
@@ -154,6 +164,7 @@ Build VST plug-in:             ${SFIZZ_VST}
 Build AU plug-in:              ${SFIZZ_AU}
 Build benchmarks:              ${SFIZZ_BENCHMARKS}
 Build tests:                   ${SFIZZ_TESTS}
+Use sndfile:                   ${SFIZZ_USE_SNDFILE}
 Use vcpkg:                     ${SFIZZ_USE_VCPKG}
 Statically link dependencies:  ${SFIZZ_STATIC_DEPENDENCIES}
 Link libatomic:                ${SFIZZ_LINK_LIBATOMIC}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -218,7 +218,7 @@ target_sources(sfizz_static PRIVATE
 target_include_directories (sfizz_static PUBLIC .)
 target_include_directories (sfizz_static PUBLIC external)
 target_link_libraries (sfizz_static PUBLIC absl::strings absl::span)
-target_link_libraries (sfizz_static PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads sfizz-sndfile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-jsl sfizz-atomic)
+target_link_libraries (sfizz_static PRIVATE sfizz_parser absl::flat_hash_map Threads::Threads st_audiofile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-jsl sfizz-atomic)
 set_target_properties (sfizz_static PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER "sfizz.h;sfizz.hpp")
 if (WIN32)
     target_compile_definitions (sfizz_static PRIVATE _USE_MATH_DEFINES)
@@ -245,7 +245,7 @@ if (SFIZZ_SHARED)
         ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp)
     target_include_directories (sfizz_shared PRIVATE .)
     target_include_directories (sfizz_shared PRIVATE external)
-    target_link_libraries (sfizz_shared PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads sfizz-sndfile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-jsl sfizz-atomic)
+    target_link_libraries (sfizz_shared PRIVATE absl::strings absl::span sfizz_parser absl::flat_hash_map Threads::Threads st_audiofile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-jsl sfizz-atomic)
     if (WIN32)
         target_compile_definitions (sfizz_shared PRIVATE _USE_MATH_DEFINES)
     endif()