diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index ab346cf30d..ef14a5acef 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -45,10 +45,7 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/glslang-config.cmake 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() + vcpkg_copy_tools(TOOL_NAMES glslang glslangValidator spirv-remap AUTO_CLEAN) endif () file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 432d78ae07..0720cd728a 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glslang", "version": "13.0.0", - "port-version": 1, + "port-version": 2, "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 ddde15e815..6bb8e5174a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3010,7 +3010,7 @@ }, "glslang": { "baseline": "13.0.0", - "port-version": 1 + "port-version": 2 }, "glui": { "baseline": "2019-11-30", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 9ae47f8906..3e0dbfeccd 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "488d78f12e3a376002a80d0058e3973ac75d4fe7", + "version": "13.0.0", + "port-version": 2 + }, { "git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6", "version": "13.0.0",