From 8a2b7de29d42d713e4816d542cd610ee59dff63e Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Wed, 31 May 2023 03:59:35 +0200 Subject: [PATCH] [sleef] Fix that port didn't install the DLL and PDB files from the buildtree (#31696) * sleef port didn't install the DLL and PDB files from the buildtree * Removed accidentally committed out-commented line of code --- ports/sleef/portfile.cmake | 24 ++++++++++++++++++++++++ ports/sleef/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sleef.json | 5 +++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake index 04fd4a7b87..e51e0374f9 100644 --- a/ports/sleef/portfile.cmake +++ b/ports/sleef/portfile.cmake @@ -22,3 +22,27 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Install DLL and PDB files +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + endif() + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleef.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefdft.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/sleefquad.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + endif() +endif() diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json index 039681d14a..60b71ed05f 100644 --- a/ports/sleef/vcpkg.json +++ b/ports/sleef/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sleef", "version": "3.5.1", - "port-version": 3, + "port-version": 4, "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", "homepage": "https://sleef.org/", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 56087e5607..775e47acaf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7514,7 +7514,7 @@ }, "sleef": { "baseline": "3.5.1", - "port-version": 3 + "port-version": 4 }, "sleepy-discord": { "baseline": "2022-02-05", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index 5e58f02d7b..b404bed22d 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12afaa5146f51bf2912339befaafd1776e10442a", + "version": "3.5.1", + "port-version": 4 + }, { "git-tree": "bd282d0004a477385c5e6487aabc83bab31059ec", "version": "3.5.1",