Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[directx-dxc] Differentiate imported locations based on build configu… (#47733)

This commit is contained in:
RedSkittleFox 2025-10-13 18:26:34 +02:00 committed by GitHub
parent 4f1406d8f7
commit bddf9c6e74
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/directx-dxc/directx-dxc-config.cmake.in
View File

@ -6,7 +6,9 @@ mark_as_advanced(DIRECTX_DXC_TOOL)
add_library(Microsoft::DirectXShaderCompiler SHARED IMPORTED)
set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES
IMPORTED_LOCATION "${_dxc_root}/@dll_dir@/@dll_name_dxc@"
IMPORTED_CONFIGURATIONS "Debug;Release"
IMPORTED_LOCATION_DEBUG "${_dxc_root}/@dll_debug_dir@/@dll_name_dxc@"
IMPORTED_LOCATION_RELEASE "${_dxc_root}/@dll_dir@/@dll_name_dxc@"
IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@"
IMPORTED_SONAME "@lib_name@"
INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc"
@ -15,7 +17,9 @@ 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_CONFIGURATIONS "Debug;Release"
IMPORTED_LOCATION_DEBUG "${_dxc_root}/@dll_debug_dir@/@dll_name_dxil@"
IMPORTED_LOCATION_RELASE "${_dxc_root}/@dll_dir@/@dll_name_dxil@"
IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@"
IMPORTED_NO_SONAME TRUE
INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc"

6
ports/directx-dxc/portfile.cmake
View File

@ -65,6 +65,11 @@ if (VCPKG_TARGET_IS_LINUX)
set(dll_name_dxc "libdxcompiler.so")
set(dll_name_dxil "libdxil.so")
set(dll_dir "lib")
if(NOT DEFINED VCPKG_BUILD_TYPE)
set(dll_debug_dir "debug/lib")
else()
set(dll_debug_dir "lib")
endif()
set(lib_name "libdxcompiler.so")
set(tool_path "tools/${PORT}/dxc")
else()
@ -112,6 +117,7 @@ else()
set(dll_name_dxc "dxcompiler.dll")
set(dll_name_dxil "dxil.dll")
set(dll_dir "bin")
set(dll_debug_dir "bin")
set(lib_name "dxcompiler.lib")
set(tool_path "tools/${PORT}/dxc.exe")
endif()

2
ports/directx-dxc/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "directx-dxc",
"version-date": "2025-07-15",
"version-date": "2025-10-10",
"description": "DirectX Shader Compiler (LLVM/Clang)",
"homepage": "https://github.com/microsoft/DirectXShaderCompiler",
"documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki",

2
versions/baseline.json
View File

@ -2425,7 +2425,7 @@
"port-version": 0
},
"directx-dxc": {
"baseline": "2025-07-15",
"baseline": "2025-10-10",
"port-version": 0
},
"directx-headers": {

5
versions/d-/directx-dxc.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "81d09907c2ceba5dedbd98506b73f7018412b9c1",
"version-date": "2025-10-10",
"port-version": 0
},
{
"git-tree": "7b15851541a9e336ecba0614257f3a630e981121",
"version-date": "2025-07-15",