From 49b11ea46464b3f2b635cc846e1d35e25778ad50 Mon Sep 17 00:00:00 2001
From: asuessenbach <asuessenbach@nvidia.com>
Date: Mon, 18 Jul 2022 14:28:35 +0200
Subject: [PATCH] Correct tests "DeviceFunctions" and "DispatchLoaderStatic" to
 actually use the static dispatch loader.

---
 tests/DeviceFunctions/CMakeLists.txt                | 5 ++++-
 tests/DeviceFunctions/DeviceFunctions.cpp           | 3 +++
 tests/DispatchLoaderStatic/CMakeLists.txt           | 4 +++-
 tests/DispatchLoaderStatic/DispatchLoaderStatic.cpp | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/DeviceFunctions/CMakeLists.txt b/tests/DeviceFunctions/CMakeLists.txt
index bb15ca8..b411958 100644
--- a/tests/DeviceFunctions/CMakeLists.txt
+++ b/tests/DeviceFunctions/CMakeLists.txt
@@ -15,6 +15,9 @@
 cmake_minimum_required(VERSION 3.2)
 
 if (NOT TESTS_BUILD_ONLY_DYNAMIC)
+
+	find_package(Vulkan REQUIRED)
+
 	project(DeviceFunctions)
 
 	set(HEADERS
@@ -33,5 +36,5 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
 	)
 
 	set_target_properties(DeviceFunctions PROPERTIES FOLDER "Tests")
-	target_link_libraries(DeviceFunctions PRIVATE utils)
+	target_link_libraries(DeviceFunctions PRIVATE utils "${Vulkan_LIBRARIES}")
 endif()
\ No newline at end of file
diff --git a/tests/DeviceFunctions/DeviceFunctions.cpp b/tests/DeviceFunctions/DeviceFunctions.cpp
index b5f54b1..650a2c2 100644
--- a/tests/DeviceFunctions/DeviceFunctions.cpp
+++ b/tests/DeviceFunctions/DeviceFunctions.cpp
@@ -24,6 +24,9 @@
 // unknow compiler... just ignore the warnings for yourselves ;)
 #endif
 
+#undef VULKAN_HPP_DISPATCH_LOADER_DYNAMIC
+#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 0
+
 #include "vulkan/vulkan.hpp"
 
 #include <iostream>
diff --git a/tests/DispatchLoaderStatic/CMakeLists.txt b/tests/DispatchLoaderStatic/CMakeLists.txt
index 2e25da1..622b259 100644
--- a/tests/DispatchLoaderStatic/CMakeLists.txt
+++ b/tests/DispatchLoaderStatic/CMakeLists.txt
@@ -16,6 +16,8 @@ cmake_minimum_required(VERSION 3.2)
 
 if (NOT TESTS_BUILD_ONLY_DYNAMIC)
 
+  find_package(Vulkan REQUIRED)
+
   project(DispatchLoaderStatic)
 
   set(HEADERS
@@ -38,6 +40,6 @@ if (NOT TESTS_BUILD_ONLY_DYNAMIC)
   endif()
 
   set_target_properties(DispatchLoaderStatic PROPERTIES FOLDER "Tests")
-  target_link_libraries(DispatchLoaderStatic PRIVATE utils)
+  target_link_libraries(DispatchLoaderStatic PRIVATE utils "${Vulkan_LIBRARIES}")
 
 endif()
\ No newline at end of file
diff --git a/tests/DispatchLoaderStatic/DispatchLoaderStatic.cpp b/tests/DispatchLoaderStatic/DispatchLoaderStatic.cpp
index 01ef09f..f1856bd 100644
--- a/tests/DispatchLoaderStatic/DispatchLoaderStatic.cpp
+++ b/tests/DispatchLoaderStatic/DispatchLoaderStatic.cpp
@@ -15,6 +15,9 @@
 // VulkanHpp Samples : DispatchLoaderStatic
 //                     Compile test on DispatchLoaderStatic functions
 
+#undef VULKAN_HPP_DISPATCH_LOADER_DYNAMIC
+#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 0
+
 #include "vulkan/vulkan.hpp"
 
 #include <iostream>