[glslang] fix tools windows (#34700)

This commit is contained in:
autoantwort 2023-10-26 22:15:55 +02:00 committed by GitHub
parent 0bc837a3fa
commit a7e4ad1363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions

View File

@ -20,7 +20,7 @@ if (ENABLE_GLSLANG_BINARIES)
vcpkg_add_to_path("${PYTHON_PATH}")
endif ()
if (WIN32)
if (VCPKG_TARGET_IS_WINDOWS)
set(PLATFORM_OPTIONS "-DOVERRIDE_MSVCCRT=OFF")
endif ()
@ -46,6 +46,9 @@ vcpkg_copy_pdbs()
if (ENABLE_GLSLANG_BINARIES)
vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_copy_tools(TOOL_NAMES glslang AUTO_CLEAN)
endif()
endif ()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,6 +1,7 @@
{
"name": "glslang",
"version": "13.0.0",
"port-version": 1,
"description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
"homepage": "https://github.com/KhronosGroup/glslang",
"license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",

View File

@ -2982,7 +2982,7 @@
},
"glslang": {
"baseline": "13.0.0",
"port-version": 0
"port-version": 1
},
"glui": {
"baseline": "2019-11-30",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6",
"version": "13.0.0",
"port-version": 1
},
{
"git-tree": "07a60a91ac63383677c203954125ba981d08f53b",
"version": "13.0.0",