diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 90620f64b5..e19597c249 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -14,11 +14,11 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path("${PYTHON_PATH}") -if(VCPKG_TARGET_IS_IOS) +if("tools" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_IOS) + set(BUILD_BINARIES ON) +else() # this case will report error since all executable will require BUNDLE DESTINATION set(BUILD_BINARIES OFF) -else() - set(BUILD_BINARIES ON) endif() vcpkg_cmake_configure( diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 1642c12981..bb8e2a4255 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glslang", "version": "11.11.0", + "port-version": 1, "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang", "dependencies": [ @@ -12,5 +13,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "tools" + ], + "features": { + "tools": { + "description": "Build the glslangValidator and spirv-remap binaries" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 75a92d6249..0a61975716 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2674,7 +2674,7 @@ }, "glslang": { "baseline": "11.11.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 f2868c3537..35a0b07010 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b468ee3d588ae97ba2d03a4723751cac81c80443", + "version": "11.11.0", + "port-version": 1 + }, { "git-tree": "15f0fd6fda1d1a10fb5e605b3e38cb66ec7b5011", "version": "11.11.0",