Skip to content

Commit 9df760a

Browse files
committed
bldsys/cmake/module/FindVulkan.cmake: restore if(APPLE) branch
As per request on the discussion thread, let's just import the changes required to build Vulkan Samples on Windows/Windows on ARM64.
1 parent 7206f99 commit 9df760a

1 file changed

Lines changed: 18 additions & 22 deletions

File tree

bldsys/cmake/module/FindVulkan.cmake

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -314,30 +314,26 @@ if(DEFINED ENV{VULKAN_SDK} AND IS_DIRECTORY "$ENV{VULKAN_SDK}")
314314
set(_Vulkan_hint_library_search_paths
315315
"$ENV{VULKAN_SDK}/lib${_Vulkan_arch_suffix}"
316316
)
317-
unset(_Vulkan_arch_suffix)
318-
if(APPLE)
319-
cmake_path(SET _MoltenVK_path NORMALIZE "$ENV{VULKAN_SDK}/../MoltenVK")
320-
if(IS_DIRECTORY "${_MoltenVK_path}")
321-
list(APPEND _Vulkan_hint_include_search_paths
322-
"${_MoltenVK_path}/include"
323-
)
324-
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
325-
list(APPEND _Vulkan_hint_library_search_paths
326-
"${_MoltenVK_path}/dylib/iOS"
327-
)
328-
elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
329-
list(APPEND _Vulkan_hint_library_search_paths
330-
"${_MoltenVK_path}/dylib/tvOS"
331-
)
332-
else()
333-
list(APPEND _Vulkan_hint_library_search_paths
334-
"${_MoltenVK_path}/dylib/macOS"
335-
)
336-
endif()
337-
endif()
338-
unset(_MoltenVK_path)
317+
endif()
318+
if(APPLE AND DEFINED Vulkan_Target_SDK)
319+
list(APPEND _Vulkan_hint_include_search_paths
320+
"${Vulkan_Target_SDK}/macOS/include"
321+
)
322+
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
323+
list(APPEND _Vulkan_hint_library_search_paths
324+
"${Vulkan_Target_SDK}/iOS/lib"
325+
)
326+
elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
327+
list(APPEND _Vulkan_hint_library_search_paths
328+
"${Vulkan_Target_SDK}/tvOS/lib"
329+
)
330+
else()
331+
list(APPEND _Vulkan_hint_library_search_paths
332+
"${Vulkan_Target_SDK}/lib"
333+
)
339334
endif()
340335
endif()
336+
unset(_Vulkan_arch_suffix)
341337

342338
find_path(Vulkan_INCLUDE_DIR
343339
NAMES vulkan/vulkan.h

0 commit comments

Comments
 (0)