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

[vsg] Update the glslang minimum required version to 15 #42294

Merged
merged 10 commits into from
Nov 27, 2024
Merged

[vsg] Update the glslang minimum required version to 15 #42294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
de8184a
[vsg] Update the glslang minimum required version to the latest versi…
gwaldron Nov 21, 2024
9da5527
Increment the port-version number in the vcpkg.json file to correspon…
gwaldron Nov 21, 2024
8dc81f9
[vsg] update vcpkg.json with proper port-version and run x-add-version
gwaldron Nov 21, 2024
bbc2de2
[vsg] Add a comment to the portfile explaining the option
gwaldron Nov 21, 2024
bb51d5f
[vsg] x-add-version
gwaldron Nov 21, 2024
98540dd
Update ports/vsg/portfile.cmake
gwaldron Nov 21, 2024
e8c5def
[vsg] Accepted a style suggestion
gwaldron Nov 21, 2024
3038efa
[vsg] x-add-version
gwaldron Nov 21, 2024
01325bc
[vsg] Remove glslang min version check per vcpkg team suggestion
gwaldron Nov 25, 2024
61bf36f
[vsg] x-add-version
gwaldron Nov 26, 2024
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
7 changes: 6 additions & 1 deletion ports/vsg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ vcpkg_from_github(
HEAD_REF master
)

vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
# added -DGLSLANG_MIN_VERSION=15 to sync with vcpkg version of glslang
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DGLSLANG_MIN_VERSION=
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME "vsg" CONFIG_PATH "lib/cmake/vsg")
vcpkg_copy_pdbs()
Expand Down
1 change: 1 addition & 0 deletions ports/vsg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "vsg",
"version": "1.1.7",
"port-version": 1,
"description": "A modern, cross platform, high performance scene graph library built upon Vulkan.",
"homepage": "http://www.vulkanscenegraph.org/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9490,7 +9490,7 @@
},
"vsg": {
"baseline": "1.1.7",
"port-version": 0
"port-version": 1
},
"vsgimgui": {
"baseline": "0.3.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vsg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f9710535eb6dade1a009e1a87c5332af3346baf9",
"version": "1.1.7",
"port-version": 1
},
{
"git-tree": "cc734f695e25c4a6641584e4f785fd95f81abf48",
"version": "1.1.7",
Expand Down