From 4491ca9143fded469c0f97bf1de3ab9c101c98dc Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Sat, 14 May 2022 07:52:53 +0800 Subject: [PATCH] [entt] Install natvis files (#24675) * [entt] Install natvis files * x-add-version Co-authored-by: Lily Wang --- ports/entt/portfile.cmake | 11 +++++++---- ports/entt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index d74c5b70b8..ab578ea380 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -15,7 +15,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DENTT_BUILD_TESTING=OFF @@ -23,13 +23,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() vcpkg_cmake_config_fixup(CONFIG_PATH lib/EnTT/cmake) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Install natvis files +file(INSTALL "${SOURCE_PATH}/natvis/entt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/natvis") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index d9311239ee..4bec827d48 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "entt", "version": "3.10.1", + "port-version": 1, "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f882081357..f6e30e9508 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2086,7 +2086,7 @@ }, "entt": { "baseline": "3.10.1", - "port-version": 0 + "port-version": 1 }, "epsilon": { "baseline": "0.9.2", diff --git a/versions/e-/entt.json b/versions/e-/entt.json index 0e6c75a8fc..5fce9683b0 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac258cd82d39f21b9a55ec179f02517f29802cdb", + "version": "3.10.1", + "port-version": 1 + }, { "git-tree": "f2c6e6ca727e3e843f0eb07544c81305175dc973", "version": "3.10.1",