Skip to content
Snippets Groups Projects
Verified Commit 236d426c authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Fix json-c dependency in shady

parent e5e52ba9
No related branches found
No related tags found
No related merge requests found
...@@ -79,3 +79,6 @@ ...@@ -79,3 +79,6 @@
[submodule "modules/shader_compiler/lib/murmur3"] [submodule "modules/shader_compiler/lib/murmur3"]
path = modules/shader_compiler/lib/murmur3 path = modules/shader_compiler/lib/murmur3
url = https://github.com/PeterScott/murmur3.git url = https://github.com/PeterScott/murmur3.git
[submodule "modules/shader_compiler/lib/json-c"]
path = modules/shader_compiler/lib/json-c
url = https://github.com/json-c/json-c.git
...@@ -42,7 +42,8 @@ set_target_properties(vkcv_shader_compiler PROPERTIES PUBLIC_HEADER "${vkcv_shad ...@@ -42,7 +42,8 @@ set_target_properties(vkcv_shader_compiler PROPERTIES PUBLIC_HEADER "${vkcv_shad
set(vkcv_shader_compiler_lib lib) set(vkcv_shader_compiler_lib lib)
set(vkcv_shader_compiler_lib_path ${PROJECT_SOURCE_DIR}/${vkcv_shader_compiler_lib}) set(vkcv_shader_compiler_lib_path ${PROJECT_SOURCE_DIR}/${vkcv_shader_compiler_lib})
# Load SPIRV-Headers # Load JSON-C and SPIRV-Headers
include(config/JSON-C.cmake)
include(config/SPIRV-Headers.cmake) include(config/SPIRV-Headers.cmake)
# Check and load GLSLANG # Check and load GLSLANG
......
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)
list(APPEND vkcv_shader_compiler_libraries json-c)
list(APPEND vkcv_shader_compiler_includes ${vkcv_shader_compiler_lib})
endif ()
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
use_git_submodule("${vkcv_shader_compiler_lib_path}/shady" shady_status) use_git_submodule("${vkcv_shader_compiler_lib_path}/shady" shady_status)
if (${shady_status}) if (${shady_status})
set(EXTERNAL_JSON_C ON CACHE INTERNAL "")
set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "") set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "")
set(EXTERNAL_MURMUR3 ON CACHE INTERNAL "") set(EXTERNAL_MURMUR3 ON CACHE INTERNAL "")
......
Subproject commit dabed80523fa5101e30f0ee57ba06b02beae73eb
Subproject commit 0a92cf7ff4081d21db0724a8e66ab868b878df7d Subproject commit defbe9e83bc4d3a5f1a5ecf5ec10db449442761a
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment