diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-12 15:04:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 15:04:35 -0700 |
| commit | e2fe95357895fad126df916d786e05ab3b526472 (patch) | |
| tree | 9bf0d2b6b4f34afb7af3a16fd45634c5f76d125a | |
| parent | 9d1fcaa73f3720d5e91f9f2e653cbaeb94dd923f (diff) | |
| parent | b0f0f402fd4efd7b4f6baf8117ca6ee77be24079 (diff) | |
| download | vcpkg-e2fe95357895fad126df916d786e05ab3b526472.tar.gz vcpkg-e2fe95357895fad126df916d786e05ab3b526472.zip | |
Merge pull request #1373 from bagong/aubio
Aubio: Avoid build error _missing config.h_ on build of tools
| -rw-r--r-- | ports/aubio/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/aubio/CONTROL | 2 | ||||
| -rw-r--r-- | ports/aubio/portfile.cmake | 5 |
3 files changed, 8 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..55b20f655 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -1,4 +1,4 @@ Source: aubio -Version: 0.46~alpha +Version: 0.46~alpha-2 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..9421f2487 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 @@ -31,4 +31,5 @@ file(COPY ${CURRENT_PACKAGES_DIR}/share/aubio) vcpkg_copy_pdbs() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/aubio) file(RENAME ${CURRENT_PACKAGES_DIR}/share/aubio/COPYING ${CURRENT_PACKAGES_DIR}/share/aubio/copyright) |