From 7f74e01712b168e50152e7177d5fd6c4231410e3 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Mon, 21 Oct 2024 22:32:08 +0000 Subject: [PATCH] [directx-dxc] fix error location path (#41554) Co-authored-by: Mengna-Li --- ports/directx-dxc/directx-dxc-config.cmake.in | 4 ++-- ports/directx-dxc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directx-dxc.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/directx-dxc/directx-dxc-config.cmake.in b/ports/directx-dxc/directx-dxc-config.cmake.in index 50b7833870..a0c2d382a6 100644 --- a/ports/directx-dxc/directx-dxc-config.cmake.in +++ b/ports/directx-dxc/directx-dxc-config.cmake.in @@ -15,9 +15,9 @@ set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES add_library(Microsoft::DXIL SHARED IMPORTED) set_target_properties(Microsoft::DXIL PROPERTIES - IMPORTED_LOCATION "${CURRENT_INSTALLED_DIR}/@dll_dir@/@dll_name_dxil@" + IMPORTED_LOCATION "${_dxc_root}/@dll_dir@/@dll_name_dxil@" IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@" - IMPORTED_SONAME "@lib_name@" + IMPORTED_NO_SONAME TRUE INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc" IMPORTED_LINK_INTERFACE_LANGUAGES "C") diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json index 07ea7b8d96..4363ab61cd 100644 --- a/ports/directx-dxc/vcpkg.json +++ b/ports/directx-dxc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directx-dxc", "version-date": "2024-07-31", - "port-version": 1, + "port-version": 2, "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 index be1b73b3b3..50feedd6fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2282,7 +2282,7 @@ }, "directx-dxc": { "baseline": "2024-07-31", - "port-version": 1 + "port-version": 2 }, "directx-headers": { "baseline": "1.614.1", diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json index ea8fce67c4..bae7e2dfcd 100644 --- a/versions/d-/directx-dxc.json +++ b/versions/d-/directx-dxc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31adbee92ae8d9b17303da6c5cb3e276c34a2b51", + "version-date": "2024-07-31", + "port-version": 2 + }, { "git-tree": "b338248d2d23bf37932394facc59075f4ad1d7a1", "version-date": "2024-07-31",