From 8948e0e91fe00e33f636607c469a6f3e0477c775 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:06:52 +0800 Subject: [PATCH] Update ports/oniguruma/portfile.cmake Co-authored-by: Billy O'Neal --- ports/oniguruma/portfile.cmake | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake index 83c3371aa04d0d..8b6dbfdc3e7b54 100644 --- a/ports/oniguruma/portfile.cmake +++ b/ports/oniguruma/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kkos/oniguruma - REF "v${VERSION}" - SHA512 7c89247d8504c635687dc61b39b39b5afefa4851b24409a8eab31273f1cbc88f3db89095ae4b135bd034147d2616c2e18fc74887300b89532eedeab75677f437 + REF "v${VERSION}" + SHA512 7c89247d8504c635687dc61b39b39b5afefa4851b24409a8eab31273f1cbc88f3db89095ae4b135bd034147d2616c2e18fc74887300b89532eedeab75677f437 HEAD_REF master - PATCHES + PATCHES fix-uwp.patch ) @@ -31,13 +31,13 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") - -vcpkg_fixup_pkgconfig() - -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/onig-config") -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config"") -endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/onig-config") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h" @@ -53,11 +53,11 @@ else() endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include/") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include/") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif()