From f9a09f76f3081471192ebe839ff37a6a62fa43fb Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 20 Feb 2026 10:55:04 -0500 Subject: [PATCH] FindVulkan: Drop support for 32-bit SDK on Windows This significantly simplifies the logic in preparation for ARM64 support. It can be re-introduced later if necessary. --- Modules/FindVulkan.cmake | 41 +++++++++------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake index 40805e48b3..d29cb2e567 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -339,38 +339,15 @@ set(_Vulkan_hint_executable_search_paths "") set(_Vulkan_hint_library_search_paths "") if(DEFINED ENV{VULKAN_SDK} AND IS_DIRECTORY "$ENV{VULKAN_SDK}") - if(WIN32) - set(_Vulkan_hint_include_search_paths - "$ENV{VULKAN_SDK}/include" - ) - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(_Vulkan_hint_executable_search_paths - "$ENV{VULKAN_SDK}/bin" - ) - set(_Vulkan_hint_library_search_paths - "$ENV{VULKAN_SDK}/lib" - ) - else() - set(_Vulkan_hint_executable_search_paths - "$ENV{VULKAN_SDK}/bin32" - "$ENV{VULKAN_SDK}/bin" - ) - set(_Vulkan_hint_library_search_paths - "$ENV{VULKAN_SDK}/lib32" - "$ENV{VULKAN_SDK}/lib" - ) - endif() - else() - set(_Vulkan_hint_include_search_paths - "$ENV{VULKAN_SDK}/include" - ) - set(_Vulkan_hint_executable_search_paths - "$ENV{VULKAN_SDK}/bin" - ) - set(_Vulkan_hint_library_search_paths - "$ENV{VULKAN_SDK}/lib" - ) - endif() + set(_Vulkan_hint_include_search_paths + "$ENV{VULKAN_SDK}/include" + ) + set(_Vulkan_hint_executable_search_paths + "$ENV{VULKAN_SDK}/bin" + ) + set(_Vulkan_hint_library_search_paths + "$ENV{VULKAN_SDK}/lib" + ) if(APPLE) cmake_path(SET _MoltenVK_path NORMALIZE "$ENV{VULKAN_SDK}/../MoltenVK") if(IS_DIRECTORY "${_MoltenVK_path}")