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
6a6433bb
Verified
Commit
6a6433bb
authored
2 years ago
by
Tobias Frisch
Browse files
Options
Downloads
Patches
Plain Diff
Added alternative way to get vulkan headers as submodule
Signed-off-by:
Tobias Frisch
<
tfrisch@uni-koblenz.de
>
parent
49588295
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitmodules
+6
-0
6 additions, 0 deletions
.gitmodules
CMakeLists.txt
+1
-0
1 addition, 0 deletions
CMakeLists.txt
config/lib/Vulkan.cmake
+20
-1
20 additions, 1 deletion
config/lib/Vulkan.cmake
lib/Vulkan-Headers
+1
-0
1 addition, 0 deletions
lib/Vulkan-Headers
lib/Vulkan-Hpp
+1
-0
1 addition, 0 deletions
lib/Vulkan-Hpp
with
29 additions
and
1 deletion
.gitmodules
+
6
−
0
View file @
6a6433bb
...
...
@@ -28,3 +28,9 @@
[submodule "modules/upscaling/lib/FidelityFX-FSR"]
path = modules/upscaling/lib/FidelityFX-FSR
url = https://github.com/GPUOpen-Effects/FidelityFX-FSR.git
[submodule "lib/Vulkan-Headers"]
path = lib/Vulkan-Headers
url = https://github.com/KhronosGroup/Vulkan-Headers.git
[submodule "lib/Vulkan-Hpp"]
path = lib/Vulkan-Hpp
url = https://github.com/KhronosGroup/Vulkan-Hpp
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
1
−
0
View file @
6a6433bb
...
...
@@ -98,6 +98,7 @@ endif()
include
(
${
vkcv_config
}
/Sources.cmake
)
message
(
STATUS
"Framework:"
)
message
(
" - Includes: [
${
vkcv_includes
}
]"
)
message
(
" - Libraries: [
${
vkcv_libraries
}
]"
)
message
(
" - Flags: [
${
vkcv_flags
}
]"
)
...
...
This diff is collapsed.
Click to expand it.
config/lib/Vulkan.cmake
+
20
−
1
View file @
6a6433bb
...
...
@@ -2,7 +2,26 @@
find_package
(
Vulkan REQUIRED
)
if
(
Vulkan_FOUND
)
list
(
APPEND vkcv_includes
${
Vulkan_INCLUDE_DIR
}
)
if
(
NOT EXISTS
${
Vulkan_INCLUDE_DIR
}
/vulkan/vulkan.h
)
use_git_submodule
(
"
${
vkcv_lib_path
}
/Vulkan-Headers"
vulkan_headers_status
)
if
(
${
vulkan_headers_status
}
)
list
(
APPEND vkcv_includes
${
vkcv_lib
}
/Vulkan-Headers/include
)
endif
()
else
()
list
(
APPEND vkcv_includes
${
Vulkan_INCLUDE_DIR
}
)
endif
()
if
(
NOT EXISTS
${
Vulkan_INCLUDE_DIR
}
/vulkan/vulkan.hpp
)
use_git_submodule
(
"
${
vkcv_lib_path
}
/Vulkan-Hpp"
vulkan_hpp_status
)
if
(
${
vulkan_hpp_status
}
)
list
(
APPEND vkcv_includes
${
vkcv_lib
}
/Vulkan-Hpp
)
endif
()
else
()
list
(
APPEND vkcv_includes
${
Vulkan_INCLUDE_DIR
}
)
endif
()
list
(
APPEND vkcv_libraries
${
Vulkan_LIBRARIES
}
)
message
(
${
vkcv_config_msg
}
" Vulkan - "
)
...
...
This diff is collapsed.
Click to expand it.
Vulkan-Headers
@
8ba8294c
Subproject commit 8ba8294c86d0e99fcb457bedbd573dd678ccc9b3
This diff is collapsed.
Click to expand it.
Vulkan-Hpp
@
ae1b0c36
Subproject commit ae1b0c36df0943795cd621a37e7f7bfd00ac958a
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