mirror of https://github.com/microsoft/vcpkg.git
[glslang] Make building binaries optional (#27345)
* Make glslang binaries an optional feature * Update versions * Use 'tools' instead of 'binaries' as feature name * Update versions Co-authored-by: Miro Vilkki <miro.vilkki@basemark.com>
This commit is contained in:
parent
5132044bc4
commit
59af419f8b
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2674,7 +2674,7 @@
|
|||
},
|
||||
"glslang": {
|
||||
"baseline": "11.11.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"glui": {
|
||||
"baseline": "2019-11-30",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b468ee3d588ae97ba2d03a4723751cac81c80443",
|
||||
"version": "11.11.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "15f0fd6fda1d1a10fb5e605b3e38cb66ec7b5011",
|
||||
"version": "11.11.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue