[directx-dxc] fix libdxil.so not found (#41439)

Co-authored-by: Mengna-Li <[email protected]>
chrullrich · Oct 11, 2024 · 3754416 · 3754416
1 parent 0d14033
commit 3754416
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/ports/directx-dxc/directx-dxc-config.cmake.in b/ports/directx-dxc/directx-dxc-config.cmake.in
@@ -15,7 +15,7 @@ set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES
 
 add_library(Microsoft::DXIL SHARED IMPORTED)
 set_target_properties(Microsoft::DXIL PROPERTIES
-   IMPORTED_LOCATION                    "${_dxc_root}/@dll_dir@/@dll_name_dxil@"
+   IMPORTED_LOCATION                    "${CURRENT_INSTALLED_DIR}/@dll_dir@/@dll_name_dxil@"
    IMPORTED_IMPLIB                      "${_dxc_root}/lib/@lib_name@"
    IMPORTED_SONAME                      "@lib_name@"
    INTERFACE_INCLUDE_DIRECTORIES        "${_dxc_root}/include/directx-dxc"

diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "directx-dxc",
   "version-date": "2024-07-31",
+  "port-version": 1,
   "description": "DirectX Shader Compiler (LLVM/Clang)",
   "homepage": "https://github.com/microsoft/DirectXShaderCompiler",
   "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2278,7 +2278,7 @@
     },
     "directx-dxc": {
       "baseline": "2024-07-31",
-      "port-version": 0
+      "port-version": 1
     },
     "directx-headers": {
       "baseline": "1.614.1",

diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b338248d2d23bf37932394facc59075f4ad1d7a1",
+      "version-date": "2024-07-31",
+      "port-version": 1
+    },
     {
       "git-tree": "496868ff6ea29c1574cdde3889ece938b185762c",
       "version-date": "2024-07-31",