diff options
| author | Be <be@mixxx.org> | 2021-09-08 07:51:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 07:51:30 -0700 |
| commit | 4304bada11ef6077b21f308193ecf3c1f4477f7a (patch) | |
| tree | ac2a62a2b5be015eba299ae0398431afa2cf97ef /ports | |
| parent | 5b2ac1fed8943460726163946ed13154ab81c9ea (diff) | |
| download | vcpkg-4304bada11ef6077b21f308193ecf3c1f4477f7a.tar.gz vcpkg-4304bada11ef6077b21f308193ecf3c1f4477f7a.zip | |
[vamp-sdk] fix library filenames to match upstream build systems (#20002)
* [vamp-sdk] fix library filenames to match upstream build systems
There were two problems:
1. The port added a `d` suffix for debug builds that upstream did
not. This caused
`find_library(VampHostSDK_LIBRARY NAMES vamp-sdk)`
to fail to find the debug library.
2. The port used the same file name for libraries on every OS but
that is not what upstream does.
* [vamp-sdk] fix capitalization of Vamp
Vamp is not an acronym.
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/vamp-sdk/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ports/vamp-sdk/vcpkg.json | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ports/vamp-sdk/CMakeLists.txt b/ports/vamp-sdk/CMakeLists.txt index d24851b31..a3d98073d 100644 --- a/ports/vamp-sdk/CMakeLists.txt +++ b/ports/vamp-sdk/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(vamp-cmake) -set(CMAKE_DEBUG_POSTFIX d) - find_package(SndFile REQUIRED) set(VAMP_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/vamp/vamp.h) @@ -65,6 +63,14 @@ set_target_properties(vamp-sdk PROPERTIES PUBLIC_HEADER "${SDK_HEADERS}") set_target_properties(vamp-hostsdk PROPERTIES PUBLIC_HEADER "${HOST_SDK_HEADERS}") +# The Visual Studio project files upstream intentionally output different +# library file names than autotools. +# https://github.com/tenacityteam/tenacity/pull/577#discussion_r702328284 +if(WIN32) + set_target_properties(vamp-sdk PROPERTIES OUTPUT_NAME VampPluginSDK) + set_target_properties(vamp-hostsdk PROPERTIES OUTPUT_NAME VampHostSDK) +endif() + set_property(TARGET vamp-sdk PROPERTY CXX_STANDARD 11) set_property(TARGET vamp-hostsdk PROPERTY CXX_STANDARD 11) diff --git a/ports/vamp-sdk/vcpkg.json b/ports/vamp-sdk/vcpkg.json index c4bc939e2..2e6b1fea4 100644 --- a/ports/vamp-sdk/vcpkg.json +++ b/ports/vamp-sdk/vcpkg.json @@ -2,7 +2,8 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "description": "Library for VAMP plugins", + "port-version": 1, + "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", "supports": "!uwp", "dependencies": [ |