From 1e775d02255aa022d13b60d741d7ff95eff21862 Mon Sep 17 00:00:00 2001
From: Jacki <jacki@thejackimonster.de>
Date: Sun, 13 Oct 2024 07:01:47 +0200
Subject: [PATCH] Add json-c build directory to includes
Signed-off-by: Jacki <jacki@thejackimonster.de>
---
modules/shader_compiler/config/JSON-C.cmake | 2 +-
modules/shader_compiler/config/Shady.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/shader_compiler/config/JSON-C.cmake b/modules/shader_compiler/config/JSON-C.cmake
index eb8b6ab7..b974f320 100644
--- a/modules/shader_compiler/config/JSON-C.cmake
+++ b/modules/shader_compiler/config/JSON-C.cmake
@@ -4,7 +4,7 @@ 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_path})
+ set(JSON_C_INCLUDE_DIRS ${vkcv_shader_compiler_lib_path} ${CMAKE_CURRENT_BINARY_DIR}/${vkcv_shader_compiler_lib})
list(APPEND vkcv_shader_compiler_libraries json-c)
list(APPEND vkcv_shader_compiler_includes ${vkcv_shader_compiler_lib})
diff --git a/modules/shader_compiler/config/Shady.cmake b/modules/shader_compiler/config/Shady.cmake
index c88aa4c8..1e7e0438 100644
--- a/modules/shader_compiler/config/Shady.cmake
+++ b/modules/shader_compiler/config/Shady.cmake
@@ -4,7 +4,7 @@ use_git_submodule("${vkcv_shader_compiler_lib_path}/shady" shady_status)
if (${shady_status})
set(EXTERNAL_JSON_C ON CACHE INTERNAL "")
set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "")
- set(EXTERNAL_JSON_C_INCLUDE ${JSON_C_INCLUDE_DIR} CACHE INTERNAL "")
+ set(EXTERNAL_JSON_C_INCLUDE ${JSON_C_INCLUDE_DIRS} CACHE INTERNAL "")
set(BUILD_RUNTIME OFF CACHE INTERNAL "")
set(BUILD_SAMPLES OFF CACHE INTERNAL "")
--
GitLab