rboullard
02d1a0a13a
Conan Packaging / Package assimp/6.0.5 (push) Failing after 0s
Conan Packaging / Package cli11/2.6.2 (push) Failing after 0s
Conan Packaging / Package eabase/01082025 (push) Failing after 0s
Conan Packaging / Package flatbuffers/25.12.19-2026-02-06-03fffb2-bigfoot (push) Failing after 0s
Conan Packaging / Package glm/1.0.3 (push) Failing after 0s
Conan Packaging / Package imgui/1.92.8-docking (push) Failing after 1s
Conan Packaging / Package lodepng/cci.20260210 (push) Failing after 0s
Conan Packaging / Package meshoptimizer/1.2 (push) Failing after 0s
Conan Packaging / Package rapidhash/3.0 (push) Failing after 0s
Conan Packaging / Package spirv-cross/1.4.341.0 (push) Failing after 1s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package unordered_dense/4.8.1 (push) Failing after 0s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Skipped
Conan Packaging / Package mimalloc/3.3.2 (push) Failing after 0s
Conan Packaging / Package mold/2.41.0 (push) Failing after 0s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Failing after 0s
Conan Packaging / Package sqlite3/3.53.3 (push) Failing after 0s
Conan Packaging / Package stduuid/1.2.3 (push) Failing after 0s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Failing after 0s
Conan Packaging / Package eastl/3.27.01 (push) Skipped
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Skipped
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Skipped
Conan Packaging / Package glslang/1.4.341.0 (push) Skipped
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Skipped
Conan Packaging / Package shaderc/2026.1 (push) Skipped
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -122,7 +122,7 @@ if (TARGET Vulkan::Headers)
|
|
get_target_property(VulkanHeaders_INCLUDE_DIRS Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
|
|
get_target_property(VulkanRegistry_DIR Vulkan::Registry INTERFACE_INCLUDE_DIRECTORIES)
|
|
else()
|
|
- find_package(VulkanHeaders REQUIRED)
|
|
+ find_package(VulkanHeaders REQUIRED MODULE)
|
|
|
|
# xxxnsubtil: this should eventually be replaced by exported targets
|
|
add_library(Vulkan-Headers INTERFACE)
|
|
@@ -174,7 +174,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
|
|
endif()
|
|
|
|
if(BUILD_WSI_WAYLAND_SUPPORT)
|
|
- find_package(Wayland REQUIRED)
|
|
+ find_package(Wayland REQUIRED MODULE)
|
|
include_directories(${WAYLAND_CLIENT_INCLUDE_DIR})
|
|
endif()
|
|
endif()
|
|
--- a/cmake/FindVulkanHeaders.cmake
|
|
+++ b/cmake/FindVulkanHeaders.cmake
|
|
@@ -63,7 +63,7 @@ if(DEFINED VULKAN_HEADERS_INSTALL_DIR)
|
|
NO_DEFAULT_PATH)
|
|
find_path(VulkanRegistry_DIR
|
|
NAMES vk.xml
|
|
- HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry
|
|
+ HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry ${VULKAN_HEADERS_INSTALL_DIR}/res/vulkan/registry
|
|
NO_CMAKE_FIND_ROOT_PATH
|
|
NO_DEFAULT_PATH)
|
|
else()
|