From 58082962cff8b39e10920dd380154494c8bc1505 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Thu, 9 Jun 2022 02:10:02 +0200
Subject: [PATCH] Force usage of Vulkan headers from submodule
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
config/lib/Vulkan.cmake | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/config/lib/Vulkan.cmake b/config/lib/Vulkan.cmake
index 5100d1b7..11e254a6 100644
--- a/config/lib/Vulkan.cmake
+++ b/config/lib/Vulkan.cmake
@@ -2,27 +2,19 @@
find_package(Vulkan REQUIRED)
if (Vulkan_FOUND)
- 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})
+ use_git_submodule("${vkcv_lib_path}/Vulkan-Headers" vulkan_headers_status)
+
+ if (${vulkan_headers_status})
+ list(APPEND vkcv_includes ${vkcv_lib_path}/Vulkan-Headers/include)
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})
+ use_git_submodule("${vkcv_lib_path}/Vulkan-Hpp" vulkan_hpp_status)
+
+ if (${vulkan_hpp_status})
+ list(APPEND vkcv_includes ${vkcv_lib_path}/Vulkan-Hpp)
endif()
list(APPEND vkcv_libraries ${Vulkan_LIBRARIES})
- message(${vkcv_config_msg} " Vulkan - ")
+ message(${vkcv_config_msg} " Vulkan - " ${Vulkan_VERSION})
endif ()
--
GitLab