Merge pull request #3141 from lilyinstarlight/fix/revendor-libaubio

Build - partially re-add vendored aubio

Author: samaaron

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-0.4.9/AUTHORS

@@ -0,0 +1 @@
+Paul Brossier <piem@aubio.org>

app/external/aubio-0.4.9/CMakeLists.txt

@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 3.13)
+project(aubio C)
+
+add_definitions(
+    -DHAVE_STDLIB_H=1
+    -DHAVE_STDIO_H=1
+    -DHAVE_MATH_H=1
+    -DHAVE_STRING_H=1
+    -DHAVE_LIMITS_H=1
+    -DHAVE_STDARG_H=1
+    -DHAVE_ERRNO_H=1
+    -DHAVE_C99_VARARGS_MACROS=1
+    -DHAVE_SNDFILE=1
+    -DHAVE_WAVREAD=1
+    -D_CRT_SECURE_NO_WARNINGS=1
+)
+
+find_package(SndFile CONFIG REQUIRED)
+
+include_directories(src)
+
+file(GLOB_RECURSE SOURCES src/*.c)
+
+if(WIN32 AND NOT MINGW)
+    set_source_files_properties(src/io/sink_wavwrite.c PROPERTIES COMPILE_FLAGS /FIWinsock2.h)
+endif()
+
+add_library(aubio ${SOURCES})
+
+target_include_directories(aubio PUBLIC ${SNDFILE_INCLUDE_DIRS})
+target_link_libraries(aubio PUBLIC ${SNDFILE_LIBRARIES})
+
+if(WIN32)
+    target_link_libraries(aubio PUBLIC ws2_32)
+endif()
+
+install(
+    TARGETS aubio
+    INCLUDES DESTINATION include
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+install(
+    DIRECTORY src/
+    DESTINATION include/aubio
+    FILES_MATCHING
+    PATTERN "*.h"
+    PATTERN "*_priv.h" EXCLUDE
+    PATTERN "config.h" EXCLUDE
+)