From 18c5c3f23b3c4e644f22037800ff19d692475713 Mon Sep 17 00:00:00 2001 From: Bagong Date: Thu, 29 Jun 2017 16:23:50 +0200 Subject: [PATCH] Avoid build error _missing config.h_ on build of tools --- ports/aubio/CMakeLists.txt | 4 ++++ ports/aubio/CONTROL | 2 +- ports/aubio/portfile.cmake | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index bb24c5b15..3e20a28f6 100644 --- a/ports/aubio/CMakeLists.txt +++ b/ports/aubio/CMakeLists.txt @@ -64,6 +64,10 @@ if(BUILD_TOOLS) target_link_libraries(${EXAMPLE_EXEC} PRIVATE aubio) target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_WIN_HACKS=1) endforeach() + # Create and add fake config.h to avoid build errors (file is generated for + # cross-platform requirements in waf build-system) + file(WRITE "${CMAKE_BINARY_DIR}/config.h" "") + include_directories(${CMAKE_BINARY_DIR}) install( TARGETS ${EXAMPLE_EXECS} diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index 3edc3db74..f919c15be 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -1,4 +1,4 @@ Source: aubio -Version: 0.46~alpha +Version: 0.46~alpha-1 Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio. Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 6f7b5fbc8..d5bca4428 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -13,8 +13,8 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS_RELEASE - #-DTOOLS_INSTALLDIR=tools/aubio - -DBUILD_TOOLS=OFF + -DTOOLS_INSTALLDIR=tools/aubio + -DBUILD_TOOLS=ON OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 -DBUILD_TOOLS=OFF