Add hint for vcpkg.json manifest mode

microsoft · Aug 23, 2024 · 93b6666 · 93b6666
1 parent cd0657c
commit 93b6666
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -252,7 +252,8 @@ if(NOT USE_PREBUILT_SHADERS)
         message(STATUS "Using VCPKG for DirectXShaderCompiler (${VCPKG_HOST_TRIPLET}).")
         find_program(DIRECTX_DXC_TOOL DXC.EXE
           REQUIRED NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_DEFAULT_PATH
-          HINTS ${DIRECTX_DXC_PATH})
+          HINTS ${DIRECTX_DXC_PATH}
+                "${CMAKE_CURRENT_LIST_DIR}/build/vcpkg_installed/${VCPKG_HOST_TRIPLET}/tools/directx-dxc")
     endif()
     add_custom_command(
         OUTPUT "${COMPILED_SHADERS}/SpriteEffect_SpriteVertexShader.inc"

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -150,7 +150,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "x64-windows",
         "VCPKG_HOST_TRIPLET": "x64-windows",
-        "DIRECTX_DXC_PATH": "build/vcpkg_installed/x64-windows/tools/directx-dxc"
+        "DIRECTX_DXC_PATH": "$env{VCPKG_ROOT}/installed/x64-windows/tools/directx-dxc"
       }
     },
     {
@@ -159,7 +159,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "x86-windows",
         "VCPKG_HOST_TRIPLET": "x64-windows",
-        "DIRECTX_DXC_PATH": "build/vcpkg_installed/x64-windows/tools/directx-dxc"
+        "DIRECTX_DXC_PATH": "$env{VCPKG_ROOT}/installed/x64-windows/tools/directx-dxc"
       }
     },
     {
@@ -168,7 +168,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "arm64-windows",
         "VCPKG_HOST_TRIPLET": "x64-windows",
-        "DIRECTX_DXC_PATH": "build/vcpkg_installed/x64-windows/tools/directx-dxc"
+        "DIRECTX_DXC_PATH": "$env{VCPKG_ROOT}/installed/x64-windows/tools/directx-dxc"
       }
     },
     {
@@ -177,7 +177,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "arm64ec-windows",
         "VCPKG_HOST_TRIPLET": "x64-windows",
-        "DIRECTX_DXC_PATH": "build/vcpkg_installed/x64-windows/tools/directx-dxc"
+        "DIRECTX_DXC_PATH": "$env{VCPKG_ROOT}/installed/x64-windows/tools/directx-dxc"
       }
     },
     {
@@ -186,7 +186,7 @@
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "arm64-windows",
         "VCPKG_HOST_TRIPLET": "arm64-windows",
-        "DIRECTX_DXC_PATH": "build/vcpkg_installed/x64-windows/tools/directx-dxc"
+        "DIRECTX_DXC_PATH": "$env{VCPKG_ROOT}/installed/arm64-windows/tools/directx-dxc"
       }
     },
     {