From 4304bada11ef6077b21f308193ecf3c1f4477f7a Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 8 Sep 2021 07:51:30 -0700 Subject: [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. --- ports/vamp-sdk/CMakeLists.txt | 10 ++++++++-- ports/vamp-sdk/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/v-/vamp-sdk.json | 5 +++++ 4 files changed, 16 insertions(+), 4 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": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4b61fbfe5..5c064cf1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6674,7 +6674,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 0 + "port-version": 1 }, "variant-lite": { "baseline": "1.2.2", diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index ecc1e3b21..d43b51431 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c71927e1997998f40a9d051d65ba4e5760f4257", + "version": "2.10", + "port-version": 1 + }, { "git-tree": "da7ad3424d8266657eec1b28b16a8d389e50b67c", "version": "2.10", -- cgit v1.2.3