From a04e01604c2399eb2d1b974133c5beb4befaef21 Mon Sep 17 00:00:00 2001
From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com>
Date: Thu, 28 Sep 2023 22:25:36 -0700
Subject: [PATCH] [d3d12-memory-allocator] Fix header file paths (#34086)

* fix d3d12-memory-allocator

* update version

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>
---
 ports/d3d12-memory-allocator/CMakeLists.txt | 2 +-
 ports/d3d12-memory-allocator/portfile.cmake | 6 +++---
 ports/d3d12-memory-allocator/vcpkg.json     | 1 +
 versions/baseline.json                      | 2 +-
 versions/d-/d3d12-memory-allocator.json     | 5 +++++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ports/d3d12-memory-allocator/CMakeLists.txt b/ports/d3d12-memory-allocator/CMakeLists.txt
index 884610b061..b0202053d8 100644
--- a/ports/d3d12-memory-allocator/CMakeLists.txt
+++ b/ports/d3d12-memory-allocator/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(${PROJECT_NAME} STATIC
 )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "src/D3D12MemAlloc.h")
-#target_include_directories(${PROJECT_NAME} PRIVATE "src/")
+target_include_directories(${PROJECT_NAME} INTERFACE PUBLIC $<INSTALL_INTERFACE:include>)
 
 install(
     TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-config
diff --git a/ports/d3d12-memory-allocator/portfile.cmake b/ports/d3d12-memory-allocator/portfile.cmake
index 89a4093bb4..0ee730ce32 100644
--- a/ports/d3d12-memory-allocator/portfile.cmake
+++ b/ports/d3d12-memory-allocator/portfile.cmake
@@ -8,10 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()
@@ -19,4 +19,4 @@ vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH cmake/)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/d3d12-memory-allocator/vcpkg.json b/ports/d3d12-memory-allocator/vcpkg.json
index b31b48509a..eadeb2167e 100644
--- a/ports/d3d12-memory-allocator/vcpkg.json
+++ b/ports/d3d12-memory-allocator/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "d3d12-memory-allocator",
   "version-date": "2021-05-05",
+  "port-version": 1,
   "description": "Easy to integrate D3d12 memory allocation library from GPUOpen",
   "homepage": "https://gpuopen.com/gaming-product/d3d12-memory-allocator/",
   "license": "MIT",
diff --git a/versions/baseline.json b/versions/baseline.json
index 254fd8c416..67034a89bd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2018,7 +2018,7 @@
     },
     "d3d12-memory-allocator": {
       "baseline": "2021-05-05",
-      "port-version": 0
+      "port-version": 1
     },
     "d3dx12": {
       "baseline": "may2021",
diff --git a/versions/d-/d3d12-memory-allocator.json b/versions/d-/d3d12-memory-allocator.json
index 0be166fc9d..38b67458f9 100644
--- a/versions/d-/d3d12-memory-allocator.json
+++ b/versions/d-/d3d12-memory-allocator.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7ada5dd1ad2d93ae0c4d56924dfaea88f8fc0e55",
+      "version-date": "2021-05-05",
+      "port-version": 1
+    },
     {
       "git-tree": "988836f8b901c1a30f4b667ac37f81f1ef3bcdd8",
       "version-date": "2021-05-05",