Build - use vendored aubio when USE_SYSTEM_LIBS=OFF

Author: lilyinstarlight

app/external/CMakeLists.txt

@@ -47,9 +47,27 @@ ExternalProject_Add(sp_link
         -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/../server/beam/tau/priv
         -DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH}
         -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+
     BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release
     )
 
+if(NOT USE_SYSTEM_LIBS)
+    find_package(SndFile CONFIG REQUIRED)
+
+    ExternalProject_Add(aubio-project
+        PREFIX aubio-prefix
+        SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/aubio-0.4.9
+
+        INSTALL_DIR ${CMAKE_BINARY_DIR}/aubio-package
+
+        CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/aubio-package
+            # propagate vcpkg information
+            -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+        )
+endif()
+
 # Build aubio_onset for server
 add_executable(aubio_onset
     ${CMAKE_CURRENT_LIST_DIR}/aubio/aubioonset.c
@@ -61,10 +79,13 @@ if(USE_SYSTEM_LIBS)
         PRIVATE
         PkgConfig::aubio)
 else()
-    find_package(Aubio CONFIG REQUIRED)
+    add_dependencies(aubio_onset aubio-project)
+    target_include_directories(aubio_onset PRIVATE ${CMAKE_BINARY_DIR}/aubio-package/include)
+    target_link_directories(aubio_onset PRIVATE ${CMAKE_BINARY_DIR}/aubio-package/lib)
     target_link_libraries(aubio_onset
         PRIVATE
-        Aubio::aubio)
+        aubio
+        SndFile::sndfile)
 endif()
 if(UNIX)
     target_link_libraries(aubio_onset
@@ -79,6 +100,11 @@ add_library(ExternalsBuilder STATIC externals.cpp)
 add_dependencies(ExternalsBuilder aubio_onset)
 
 # Copy prebuilt files
+add_custom_command(
+    TARGET aubio_onset POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:aubio_onset> ${CMAKE_CURRENT_SOURCE_DIR}/../server/native/
+)
+
 if(WIN32)
   if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit
       add_custom_command(
@@ -100,8 +126,3 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES Darwin) # macOS
     COMMAND ${CMAKE_COMMAND} -E rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/../server/native/supercollider/extra-plugins
   )
 endif()
-
-add_custom_command(
-    TARGET ExternalsBuilder POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:aubio_onset> ${CMAKE_CURRENT_SOURCE_DIR}/../server/native/
-)

app/external/aubio/config.h

@@ -2,13 +2,13 @@
 
 #define HAVE_STDLIB_H 1
 #define HAVE_STDIO_H 1
-#define HAVE_STRING_H 1
 #define HAVE_MATH_H 1
-#define HAVE_ERRNO_H 1
+#define HAVE_STRING_H 1
 #define HAVE_LIMITS_H 1
 #define HAVE_STDARG_H 1
-#define HAVE_MEMCPY_HACKS 1
+#define HAVE_ERRNO_H 1
 #define HAVE_C99_VARARGS_MACROS 1
+#define HAVE_MEMCPY_HACKS 1
 
 #ifdef WIN32
 #define HAVE_WIN_HACKS 1

app/linux-pre-vcpkg.sh

@@ -43,9 +43,9 @@ fi
 cd vcpkg
 
 if [ "$no_imgui" == true ]; then
-    ./vcpkg install aubio[core] kissfft crossguid platform-folders reproc catch2 --recurse
+    ./vcpkg install libsndfile kissfft crossguid platform-folders reproc catch2 --recurse
 else
-    ./vcpkg install aubio[core] kissfft fmt crossguid sdl2[x11] gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --recurse
+    ./vcpkg install libsndfile kissfft fmt crossguid sdl2[x11] gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --recurse
 fi
 
 

app/mac-pre-vcpkg.sh

@@ -44,9 +44,9 @@ cd vcpkg
 triplet=(x64-osx)
 
 if [ "$no_imgui" == true ]; then
-    ./vcpkg install aubio[core] kissfft crossguid platform-folders reproc catch2 --triplet ${triplet[0]} --recurse
+    ./vcpkg install libsndfile kissfft crossguid platform-folders reproc catch2 --triplet ${triplet[0]} --recurse
 else
-    ./vcpkg install aubio[core] kissfft fmt sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet ${triplet[0]} --recurse
+    ./vcpkg install libsndfile kissfft fmt sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet ${triplet[0]} --recurse
 fi
 
 

app/win-pre-vcpkg.bat

@@ -17,6 +17,6 @@ if not exist "vcpkg\vcpkg.exe" (
 
 cd vcpkg
 @echo Installing Libraries
-vcpkg install aubio[core] kissfft fmt crossguid sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet x64-windows-static-md --recurse
+vcpkg install libsndfile kissfft fmt crossguid sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet x64-windows-static-md --recurse
 
 cd %WORKING_DIR%