[glslang] support iOS triplets (#16037)

* [glslang] support ios triplets

* [glslang] update baseline

* [glslang] fix wrong git-tree SHA
This commit is contained in:
Park DongHa 2021-02-09 09:04:50 +09:00 committed by GitHub
parent 31078255f8
commit 1ef255cb25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 9 deletions

View File

@ -1,5 +0,0 @@
Source: glslang
Version: 2019-03-05
Port-Version: 2
Homepage: https://github.com/KhronosGroup/glslang
Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator

View File

@ -11,12 +11,20 @@ vcpkg_from_github(
CMakeLists-windows.patch
)
if(VCPKG_TARGET_IS_IOS)
# this case will report error since all executable will require BUNDLE DESTINATION
set(BUILD_BINARIES OFF)
else()
set(BUILD_BINARIES ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCMAKE_DEBUG_POSTFIX=d
-DSKIP_GLSLANG_INSTALL=OFF
-DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES}
)
vcpkg_install_cmake()
@ -25,9 +33,13 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/glslang)
vcpkg_copy_pdbs()
file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
if(NOT BUILD_BINARIES)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
else()
file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/bin)
# Handle copyright
file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glslang)

7
ports/glslang/vcpkg.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "glslang",
"version-string": "2019-03-05",
"port-version": 3,
"description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
"homepage": "https://github.com/KhronosGroup/glslang"
}

View File

@ -2222,7 +2222,7 @@
},
"glslang": {
"baseline": "2019-03-05",
"port-version": 2
"port-version": 3
},
"glui": {
"baseline": "2019-11-30",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a7d9b6a3d936d273c6b1966eb3b8fe8cb1ba28d1",
"version-string": "2019-03-05",
"port-version": 3
},
{
"git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b",
"version-string": "2019-03-05",