From 21938223614eec1fdba0031bf4d8023d90d4e6ce Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:07:40 +0100 Subject: [PATCH] [Libdshowcapture] fix single config builds (#42728) --- ports/libdshowcapture/portfile.cmake | 10 +++++++--- ports/libdshowcapture/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdshowcapture.json | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/libdshowcapture/portfile.cmake b/ports/libdshowcapture/portfile.cmake index 79633e0f7f..c33902a0f0 100644 --- a/ports/libdshowcapture/portfile.cmake +++ b/ports/libdshowcapture/portfile.cmake @@ -13,12 +13,16 @@ vcpkg_cmake_configure( vcpkg_cmake_build(TARGET libdshowcapture) # Copy files -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libdshowcapture" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() -file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libdshowcapture.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/dshowcapture.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/ports/libdshowcapture/vcpkg.json b/ports/libdshowcapture/vcpkg.json index 643b10dc84..4d1214a340 100644 --- a/ports/libdshowcapture/vcpkg.json +++ b/ports/libdshowcapture/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libdshowcapture", "version": "0.6.0", - "port-version": 3, + "port-version": 4, "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows.", "supports": "windows & !uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 59aba31f42..086dfbb73c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4466,7 +4466,7 @@ }, "libdshowcapture": { "baseline": "0.6.0", - "port-version": 3 + "port-version": 4 }, "libdvdcss": { "baseline": "1.4.3", diff --git a/versions/l-/libdshowcapture.json b/versions/l-/libdshowcapture.json index 7cb7815ef0..da1649b62e 100644 --- a/versions/l-/libdshowcapture.json +++ b/versions/l-/libdshowcapture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df899babb69eb01159e5777fc4d4ef07a1570724", + "version": "0.6.0", + "port-version": 4 + }, { "git-tree": "fc1b7753ef4b7e6fc6d6390bc86fe5186ca45a92", "version": "0.6.0",