Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Framework
Commits
1e775d02
Unverified
Commit
1e775d02
authored
5 months ago
by
Jacki
Browse files
Options
Downloads
Patches
Plain Diff
Add json-c build directory to includes
Signed-off-by:
Jacki
<
jacki@thejackimonster.de
>
parent
2494960b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/shader_compiler/config/JSON-C.cmake
+1
-1
1 addition, 1 deletion
modules/shader_compiler/config/JSON-C.cmake
modules/shader_compiler/config/Shady.cmake
+1
-1
1 addition, 1 deletion
modules/shader_compiler/config/Shady.cmake
with
2 additions
and
2 deletions
modules/shader_compiler/config/JSON-C.cmake
+
1
−
1
View file @
1e775d02
...
...
@@ -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_DIR
S
${
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
}
)
...
...
This diff is collapsed.
Click to expand it.
modules/shader_compiler/config/Shady.cmake
+
1
−
1
View file @
1e775d02
...
...
@@ -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_DIR
S
}
CACHE INTERNAL
""
)
set
(
BUILD_RUNTIME OFF CACHE INTERNAL
""
)
set
(
BUILD_SAMPLES OFF CACHE INTERNAL
""
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment