Skip to content

Update FindVulkan.cmake to cross-compile for Windows/Windows on ARM64 #1490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fgiancane8 wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Update FindVulkan.cmake to cross-compile for Windows/Windows on ARM64 #1490

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1a672f7
Remove vendored downstream version of `FindVulkan.cmake`
fgiancane8 Feb 25, 2026
6f1680f
bldsys/toolchain: introduce `ios.cmake` toolchain file
fgiancane8 Mar 4, 2026
265d313
build.yml: update workflow for iOS CI to use ios toolchain file
fgiancane8 Mar 4, 2026
fade4d5
app/CMakeLists.txt: compute `Vulkan_Target_SDK`
fgiancane8 Mar 5, 2026
1e7d48c
Revert "Remove vendored downstream version of `FindVulkan.cmake`"
fgiancane8 Mar 6, 2026
c7b2b43
Revert "bldsys/toolchain: introduce `ios.cmake` toolchain file"
fgiancane8 Mar 6, 2026
9c2eb4a
Revert "build.yml: update workflow for iOS CI to use ios toolchain file"
fgiancane8 Mar 6, 2026
a6ef4f0
bldsys/cmake/module/FindVulkan.cmake: Backport upstream changes
fgiancane8 Mar 6, 2026
5e92e7f
Fix wrong copyright years. Add license attributions for my changes.
fgiancane8 Mar 9, 2026
7206f99
app/CMakeLists.txt: restore file to its original content
fgiancane8 Mar 27, 2026
1765f77
bldsys/cmake/module/FindVulkan.cmake: restore if(APPLE) branch
fgiancane8 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 45 additions & 27 deletions bldsys/cmake/module/FindVulkan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Updates for iOS Copyright (c) 2024, Holochip Inc.
# Updates for iOS Copyright (c) 2024-2026, Holochip Inc.
# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.

Expand Down Expand Up @@ -263,40 +264,57 @@ endif()

if(WIN32)
set(_Vulkan_library_name vulkan-1)
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"
"$ENV{VULKAN_SDK}/bin"
)
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}/bin32"
"$ENV{VULKAN_SDK}/lib"
"$ENV{VULKAN_SDK}/bin"
)
endif()
else()
set(_Vulkan_library_name vulkan)
endif()
set(_Vulkan_hint_include_search_paths "")
set(_Vulkan_hint_executable_search_paths "")
set(_Vulkan_hint_library_search_paths "")

if(DEFINED ENV{VULKAN_SDK} AND IS_DIRECTORY "$ENV{VULKAN_SDK}")
set(_Vulkan_hint_include_search_paths
"$ENV{VULKAN_SDK}/include"
"$ENV{VULKAN_SDK}/include"
)
set(_Vulkan_hint_executable_search_paths
"$ENV{VULKAN_SDK}/bin"
"$ENV{VULKAN_SDK}/bin"
)
if(WIN32)
# Detect the target architecture from one of:
# - the C++ compiler,
# - the C compiler,
# - the VS generator,
# - the command-line environment,
# - fallback to CMAKE_SYSTEM_PROCESSOR.
if(CMAKE_CXX_COMPILER_LOADED AND CMAKE_CXX_COMPILER_ARCHITECTURE_ID)
set(_Vulkan_arch_name "${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
elseif(CMAKE_C_COMPILER_LOADED AND CMAKE_C_COMPILER_ARCHITECTURE_ID)
set(_Vulkan_arch_name "${CMAKE_C_COMPILER_ARCHITECTURE_ID}")
elseif(CMAKE_VS_PLATFORM_NAME)
set(_Vulkan_arch_name "${CMAKE_VS_PLATFORM_NAME}")
elseif(DEFINED ENV{VSCMD_ARG_TGT_ARCH})
set(_Vulkan_arch_name "$ENV{VSCMD_ARG_TGT_ARCH}")
elseif(CMAKE_SYSTEM_PROCESSOR)
set(_Vulkan_arch_name "${CMAKE_SYSTEM_PROCESSOR}")
endif()
# The Vulkan SDK may provide arch-specific directories for cross-compiling.
if(_Vulkan_arch_name MATCHES "^(ARM64|arm64|aarch64)" AND IS_DIRECTORY "$ENV{VULKAN_SDK}/lib-arm64")
# On X64 hosts the Vulkan SDK provides `-arm64` dirs for cross-compiling to ARM64.
set(_Vulkan_arch_suffix "-arm64")
elseif(_Vulkan_arch_name MATCHES "^(X64|x64|x86_64)" AND IS_DIRECTORY "$ENV{VULKAN_SDK}/lib-x64")
# On ARM64 hosts the Vulkan SDK provides `-x64` dirs for cross-compiling to x64.
set(_Vulkan_arch_suffix "-x64")
else()
# Otherwise assume we are compiling for the host.
set(_Vulkan_arch_suffix "")
endif()
unset(_Vulkan_arch_name)
else()
set(_Vulkan_arch_suffix "")
endif()
set(_Vulkan_hint_library_search_paths
"$ENV{VULKAN_SDK}/lib"
"$ENV{VULKAN_SDK}/lib${_Vulkan_arch_suffix}"
)
unset(_Vulkan_arch_suffix)
endif()
if(APPLE AND DEFINED Vulkan_Target_SDK)
list(APPEND _Vulkan_hint_include_search_paths
Expand Down