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.

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 to v1.0.6 #31874

Merged
merged 3 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 21 additions & 6 deletions ports/vsg/devendor-glslang.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61da709f..472bc6af 100644
index 6e7ec437..db4d30f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,11 @@ find_package(Vulkan ${Vulkan_MIN_VERSION} REQUIRED)
Expand All @@ -16,10 +16,10 @@ index 61da709f..472bc6af 100644

if (Git_FOUND)
diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt
index 4154312..7afcdd4 100644
index 3d9625e4..96285e99 100644
--- a/src/vsg/CMakeLists.txt
+++ b/src/vsg/CMakeLists.txt
@@ -226,7 +226,7 @@ set(SOURCES
@@ -227,14 +227,24 @@ set(SOURCES
utils/LoadPagedLOD.cpp
)

Expand All @@ -28,10 +28,12 @@ index 4154312..7afcdd4 100644

# include glslang source code directly into the VulkanScenegraph library build.
include(../glslang/build_vars.cmake)
@@ -234,6 +234,14 @@ endif()
endif()

# set up library dependencies
set(LIBRARIES PUBLIC
-set(LIBRARIES PUBLIC
+set(LIBRARIES
+ PRIVATE
+ glslang::glslang
+ glslang::OSDependent
+ glslang::MachineIndependent
Expand All @@ -40,10 +42,11 @@ index 4154312..7afcdd4 100644
+ glslang::OGLCompiler
+ glslang::SPVRemapper
+ glslang::SPIRV
+ PUBLIC
Vulkan::Vulkan
Threads::Threads
)
@@ -364,9 +372,6 @@ target_include_directories(vsg
@@ -365,9 +375,6 @@ target_include_directories(vsg
PUBLIC
$<BUILD_INTERFACE:${VSG_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${VSG_BINARY_DIR}/include>
Expand All @@ -66,3 +69,15 @@ index 71a7f09f..803f26a1 100644
# include <glslang/Public/ResourceLimits.h>
# include <glslang/Public/ShaderLang.h>
#endif
diff --git a/src/vsg/vsgConfig.cmake.in b/src/vsg/vsgConfig.cmake.in
index 7ea0de02..4f7e77bd 100644
--- a/src/vsg/vsgConfig.cmake.in
+++ b/src/vsg/vsgConfig.cmake.in
@@ -2,6 +2,7 @@ include(CMakeFindDependencyMacro)

find_package(Vulkan @Vulkan_MIN_VERSION@ REQUIRED)
find_dependency(Threads)
+find_dependency(glslang)

@FIND_DEPENDENCY_WINDOWING@
include("${CMAKE_CURRENT_LIST_DIR}/vsgTargets.cmake")
2 changes: 1 addition & 1 deletion ports/vsg/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vsg-dev/VulkanSceneGraph
REF "v${VERSION}"
SHA512 da5c9448da6bd2bd6edcb82ed1ac67aded9c3fd957fb7d3c78bb741d8993a5e90b134433237a63bf1a6eb23b30a1e6b4ea2115416f8d32464bd04925d8dbcd34
SHA512 b5f00190689473402157dfed34234359129a6b62f8eb0c118358af36639dcafce6c747c43d83b8602f3d06c011d3fcc98f27a95282be0a7601795ebe88921dbb
HEAD_REF master
PATCHES devendor-glslang.patch
)
Expand Down
3 changes: 1 addition & 2 deletions ports/vsg/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "vsg",
"version": "1.0.5",
"port-version": 1,
"version": "1.0.6",
"description": "A modern, cross platform, high performance scene graph library built upon Vulkan.",
"homepage": "http://www.vulkanscenegraph.org/",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8477,8 +8477,8 @@
"port-version": 2
},
"vsg": {
"baseline": "1.0.5",
"port-version": 1
"baseline": "1.0.6",
"port-version": 0
},
"vtk": {
"baseline": "9.2.0-pv5.11.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vsg.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "083510fe30c973a53fe65f4565d7c4159fdff36a",
"version": "1.0.6",
"port-version": 0
},
{
"git-tree": "c2ade86b1dee203ecaa4a401e76d80a205b6c71f",
"version": "1.0.5",
Expand Down