vulkan loader variable config

Author: MathewBensonCode

CMakePresets.json

@@ -46,6 +46,10 @@
                 "USE_MASM": "OFF",
                 "USE_GAS": "OFF",
                 "UPDATE_DEPS": "ON",
+                "BUILD_WSI_XCB_SUPPORT": "OFF",
+                "BUILD_WSI_XLIB_SUPPORT": "OFF",
+                "BUILD_WSI_WAYLAND_SUPPORT": "OFF",
+
 
                 "ALLOW_EXTERNAL_SPIRV_TOOLS": "ON",
 

dependencies.cmake

@@ -4,7 +4,7 @@ FetchContent_Declare(
   fmt
   GIT_REPOSITORY https://github.com/fmtlib/fmt.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
@@ -33,51 +33,51 @@ FetchContent_Declare(
   glfw3
   GIT_REPOSITORY https://github.com/glfw/glfw.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
   spdlog
   GIT_REPOSITORY https://github.com/gabime/spdlog.git
   GIT_SHALLOW TRUE
   GIT_TAG v1.15.3
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
   glm
   GIT_REPOSITORY https://github.com/g-truc/glm.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
   EnTT 
   GIT_REPOSITORY https://github.com/skypjack/entt.git
   GIT_SHALLOW TRUE 
-  FIND_PACKAGE_ARGS
+#  FIND_PACKAGE_ARGS
   )
 
 FetchContent_Declare(
   assimp
   GIT_REPOSITORY https://github.com/assimp/assimp.git
   GIT_TAG v5.3.0
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
   stduuid
   GIT_REPOSITORY https://github.com/mariusbancila/stduuid.git
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
   yaml-cpp
   GIT_REPOSITORY https://github.com/jbeder/yaml-cpp
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 
@@ -86,23 +86,23 @@ FetchContent_Declare(
   GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
   GIT_TAG main
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
     VulkanMemoryAllocator
   GIT_REPOSITORY
     https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
   GIT_SHALLOW TRUE
-  FIND_PACKAGE_ARGS 
+#  FIND_PACKAGE_ARGS 
   )
 
 FetchContent_Declare(
     SPIRV-Headers
     GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Headers.git
     GIT_SHALLOW TRUE
     GIT_TAG main
-    FIND_PACKAGE_ARGS 
+#    FIND_PACKAGE_ARGS 
 )
 
 FetchContent_Declare(
@@ -111,7 +111,7 @@ FetchContent_Declare(
     GIT_SHALLOW TRUE
     GIT_TAG main-tot
     SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/glslang"
-    FIND_PACKAGE_ARGS  
+#    FIND_PACKAGE_ARGS  
 )
 
 
@@ -120,7 +120,7 @@ FetchContent_Declare(
     GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
     GIT_SHALLOW TRUE
     GIT_TAG main
-    FIND_PACKAGE_ARGS 
+#    FIND_PACKAGE_ARGS 
 )
 
 
@@ -129,22 +129,22 @@ Fetchcontent_Declare(
     GIT_REPOSITORY https://github.com/google/googletest.git
     GIT_SHALLOW TRUE
     GIT_TAG main
-    FIND_PACKAGE_ARGS
+#    FIND_PACKAGE_ARGS
 )
 
 Fetchcontent_Declare(
   nlohmann_json
     GIT_REPOSITORY https://github.com/nlohmann/json.git
     GIT_SHALLOW TRUE
-    FIND_PACKAGE_ARGS 
+#    FIND_PACKAGE_ARGS 
 )
 
 Fetchcontent_Declare(
     tlsf
     GIT_REPOSITORY https://github.com/mattconte/tlsf
     GIT_SHALLOW TRUE
     SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/tlsf
-    FIND_PACKAGE_ARGS
+#    FIND_PACKAGE_ARGS
 )
 
 Fetchcontent_Declare(
@@ -153,7 +153,7 @@ Fetchcontent_Declare(
     GIT_SHALLOW TRUE
     GIT_TAG main
     SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/CLI11
-    FIND_PACKAGE_ARGS
+#    FIND_PACKAGE_ARGS
 )
 
 
@@ -162,7 +162,7 @@ Fetchcontent_Declare(
     GIT_REPOSITORY https://github.com/Nicoshev/rapidhash
     GIT_SHALLOW TRUE
     SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/rapidhash
-    FIND_PACKAGE_ARGS
+#    FIND_PACKAGE_ARGS
 )
 
 FetchContent_Declare(Vulkan-Loader
@@ -227,7 +227,7 @@ target_sources(
 
 target_compile_definitions(imgui PUBLIC GLFW_INCLUDE_VULKAN IMGUI_DEFINE_MATH_OPERATORS)
 
-target_link_libraries(imgui PUBLIC glfw vulkan)
+target_link_libraries(imgui PUBLIC glfw Vulkan::Loader)
 
 add_library(imguizmo STATIC)