From a7e4ad1363a31f0a2e3d7704282c4c9a5a07d76e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:15:55 +0200 Subject: [PATCH] [glslang] fix tools windows (#34700) --- ports/glslang/portfile.cmake | 5 ++++- ports/glslang/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glslang.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 7353c7d4af..ab346cf30d 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -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") diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 159c4240c6..432d78ae07 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 205637544f..186fb6c14e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2982,7 +2982,7 @@ }, "glslang": { "baseline": "13.0.0", - "port-version": 0 + "port-version": 1 }, "glui": { "baseline": "2019-11-30", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 98d60404ae..9ae47f8906 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6", + "version": "13.0.0", + "port-version": 1 + }, { "git-tree": "07a60a91ac63383677c203954125ba981d08f53b", "version": "13.0.0",