From 53ba48e81abe916466fb651225fbad05b2c9cc3f Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Sat, 13 Jan 2024 20:03:32 +0100
Subject: [PATCH] Fix shady include dir of json-c
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/shader_compiler/config/JSON-C.cmake | 4 +++-
modules/shader_compiler/config/Shady.cmake | 2 ++
modules/shader_compiler/lib/shady | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules/shader_compiler/config/JSON-C.cmake b/modules/shader_compiler/config/JSON-C.cmake
index 498b933c..bf864bb2 100644
--- a/modules/shader_compiler/config/JSON-C.cmake
+++ b/modules/shader_compiler/config/JSON-C.cmake
@@ -3,7 +3,9 @@ use_git_submodule("${vkcv_shader_compiler_lib_path}/json-c" json_c_status)
if (${json_c_status})
add_subdirectory(${vkcv_shader_compiler_lib}/json-c)
+
+ set(JSON_C_INCLUDE_DIR ${vkcv_shader_compiler_lib})
list(APPEND vkcv_shader_compiler_libraries json-c)
- list(APPEND vkcv_shader_compiler_includes ${vkcv_shader_compiler_lib})
+ list(APPEND vkcv_shader_compiler_includes ${JSON_C_INCLUDE_DIR})
endif ()
diff --git a/modules/shader_compiler/config/Shady.cmake b/modules/shader_compiler/config/Shady.cmake
index b5d3bf6c..06a8a824 100644
--- a/modules/shader_compiler/config/Shady.cmake
+++ b/modules/shader_compiler/config/Shady.cmake
@@ -6,6 +6,8 @@ if (${shady_status})
set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "")
set(EXTERNAL_MURMUR3 ON CACHE INTERNAL "")
+ set(EXTERNAL_JSON_C_INCLUDE ${JSON_C_INCLUDE_DIR} CACHE INTERNAL "")
+
add_subdirectory(${vkcv_shader_compiler_lib}/shady)
if (vkcv_build_attribute EQUAL "SHARED")
diff --git a/modules/shader_compiler/lib/shady b/modules/shader_compiler/lib/shady
index defbe9e8..07ad7b17 160000
--- a/modules/shader_compiler/lib/shady
+++ b/modules/shader_compiler/lib/shady
@@ -1 +1 @@
-Subproject commit defbe9e83bc4d3a5f1a5ecf5ec10db449442761a
+Subproject commit 07ad7b174107269ae1c690ae6f11fa79ed0d42aa
--
GitLab