Experiment with optional Vulkan Setup

Author: MathewBensonCode

ZEngine/ZEngine/CMakeLists.txt

@@ -33,7 +33,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 endif()
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	target_link_libraries(zEngineLib PRIVATE stdc++fs)
+    target_link_libraries(zEngineLib PUBLIC stdc++fs)
+    target_compile_definitions (zEngineLib PUBLIC VK_USE_PLATFORM_WAYLAND_KHR)
 endif ()
 
 target_link_libraries (zEngineLib PUBLIC imported::External_libs)

ZEngine/ZEngine/Hardwares/VulkanDevice.cpp

@@ -6,7 +6,7 @@
  */
 #define VMA_IMPLEMENTATION
 #define VMA_VULKAN_VERSION 1003000 // Vulkan 1.3
-
+#include <vk_mem_alloc.h>
 #include <ZEngine/Hardwares/VulkanDevice.h>
 #include <ZEngine/Helpers/MemoryOperations.h>
 #include <ZEngine/Helpers/ThreadPool.h>

ZEngine/ZEngine/Windows/Inputs/KeyCode.h

@@ -137,5 +137,5 @@ namespace ZEngine::Windows::Inputs
 
     } GlfwKey;
 
-    auto format_as(GlfwKey f) { return fmt::underlying(f); }
+    inline auto format_as(GlfwKey f) { return fmt::underlying(f); }
 } // namespace ZEngine::Windows::Inputs

ZEngine/tests/CMakeLists.txt

@@ -8,6 +8,5 @@ add_executable(ZEngineTests ${TEST_SOURCES})
 
 target_link_libraries(ZEngineTests PRIVATE
     zEngineLib
-    GTest::gtest
     GTest::gtest_main
 )

dependencies.cmake

@@ -40,6 +40,7 @@ set(YAML_BUILD_SHARED_LIBS=OFF)
 #VULKAN_LOADER
 set(USE_MASM=OFF)
 set(USE_GAS=OFF)
+set(UPDATE_DEPS=ON)
 
 #GLSLANG
 set(ALLOW_EXTERNAL_SPIRV_TOOLS=ON)
@@ -224,6 +225,7 @@ Fetchcontent_Declare(
 FetchContent_Declare(Vulkan-Loader
     GIT_REPOSITORY https://github.com/KhronosGroup/Vulkan-Loader
     GIT_SHALLOW TRUE
+    GIT_TAG main
 )
 
 FetchContent_Declare(Vulkan-Headers
@@ -259,6 +261,17 @@ FetchContent_MakeAvailable(
 
 find_package(Vulkan REQUIRED)
 
+if(NOT Vulkan_FOUND)
+      
+    fetchpackage_makeavailable(
+        Vulkan-Loader
+    )
+
+    add_library(myvulkan INTERFACE)
+    target_link_libraries(myvulkan INTERFACE Vulkan::Headers Vulkan::Loader)
+    add_library(Vulkan::Vulkan ALIAS myvulkan)
+endif()
+
 set(IMGUIDIR ${FETCHCONTENT_BASE_DIR}/imgui)
 
 add_library(imgui STATIC)
@@ -281,7 +294,7 @@ target_sources(
 
 target_compile_definitions(imgui PUBLIC GLFW_INCLUDE_VULKAN IMGUI_DEFINE_MATH_OPERATORS)
 
-target_link_libraries(imgui PUBLIC glfw Vulkan::Vulkan)
+target_link_libraries(imgui PUBLIC glfw Vulkan::Headers)
 
 add_library(imguizmo STATIC)
 
@@ -323,7 +336,8 @@ target_link_libraries(External_libs
          glslang::glslang-default-resource-limits
          glslang::SPIRV
          glslang::SPVRemapper
-         GPUOpen::VulkanMemoryAllocator
+         GPUOpen::VulkanMemoryAllocator 
+         Vulkan::Vulkan
 )
 
 add_library(imported::External_libs ALIAS External_libs)