Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[glslang] Provide glslang-default-resource-limits library. #15624

Merged
merged 4 commits into from
Jan 17, 2021
Merged

[glslang] Provide glslang-default-resource-limits library. #15624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0af5479
[glslang] Provide glslang-default-resource-limits library.
wolfpld Jan 13, 2021
830319d
[glslang] Use Port-Version field.
wolfpld Jan 14, 2021
868037a
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Jan 15, 2021
d19e25d
Update port_versions
Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions port_versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2181,8 +2181,8 @@
"port-version": 0
},
"glslang": {
"baseline": "2019-03-05-1",
"port-version": 0
"baseline": "2019-03-05",
"port-version": 2
},
"glui": {
"baseline": "2019-11-30",
Expand Down
5 changes: 5 additions & 0 deletions port_versions/g-/glslang.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b",
"version-string": "2019-03-05",
"port-version": 2
},
{
"git-tree": "02b23c6369ff2b1aed2e57bceeb184b544d388e2",
"version-string": "2019-03-05-1",
Expand Down
13 changes: 13 additions & 0 deletions ports/glslang/CMakeLists-targets.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,16 @@ index f918d7a..329800f 100644
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
else()
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index 5cea53d9..43e45534 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -46,7 +46,7 @@ if(ENABLE_GLSLANG_INSTALL)
install(TARGETS spirv-remap
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

- if(BUILD_SHARED_LIBS)
+ if(BUILD_SHARED_LIBS OR TRUE)
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
install(TARGETS glslang-default-resource-limits
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif()
5 changes: 3 additions & 2 deletions ports/glslang/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: glslang
Version: 2019-03-05-1
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
Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator