From e6c2e4cde9c22cd3689929bd1f3da5016da61629 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Sun, 19 May 2024 12:34:27 -0400 Subject: [PATCH] [bgfx]: add relative path to tools to template --- ports/bgfx/portfile.cmake | 5 +++-- versions/b-/bgfx.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/bgfx/portfile.cmake b/ports/bgfx/portfile.cmake index 28b3693a7b0135..c7cb0f9adb545f 100644 --- a/ports/bgfx/portfile.cmake +++ b/ports/bgfx/portfile.cmake @@ -34,7 +34,8 @@ vcpkg_cmake_configure( -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_OPENGLES_VERSION=30 -DBGFX_CMAKE_USER_SCRIPT=vcpkg-inject-packages.cmake - -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} + # It's important to have `${CMAKE_CURRENT_SOURCE_DIR}` verbatim escaped in bgfxConfig.cmake + -DVCPKG_CURRENT_HOST_INSTALLED_DIR="\\\$\$\{CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/${HOST_TRIPLET}/tools/bgfx" ${FEATURE_OPTIONS} ) @@ -42,7 +43,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_copy_pdbs() -if ("tools" IN_LIST FEATURES) +if (BGFX_BUILD_TOOLS) vcpkg_copy_tools( TOOL_NAMES bin2c shaderc geometryc geometryv texturec texturev AUTO_CLEAN ) diff --git a/versions/b-/bgfx.json b/versions/b-/bgfx.json index f8f8d323598186..e036fd5cb70a6a 100644 --- a/versions/b-/bgfx.json +++ b/versions/b-/bgfx.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4ba27008e0ff609c3462168edfe1ed0daa3e8d27", + "git-tree": "fd784a42081bcf6496634e4b6645a0d664508806", "version": "1.127.8725-467", "port-version": 0 },