Commit f9b1603
Update
* Remove vendored downstream version of `FindVulkan.cmake`
Let CMake use its own bundled version of this module. It is more maintained and has some quality of life fixed, most notably cross-compilation on Windows(ARM64/Intel).
See KhronosGroup#1489 for more context about this change.
* bldsys/toolchain: introduce `ios.cmake` toolchain file
As per upstream CMake recommendations, configure iOS targets using a
toolchain file.
* build.yml: update workflow for iOS CI to use ios toolchain file
Move all the variables that were passed through command line here, as per
CMake upstream recommendation.
* app/CMakeLists.txt: compute `Vulkan_Target_SDK`
Removing downstream vendored version of `FindVulkan.cmake` caused this
variable to disappear. Compute it again where it is needed.
KhronosGroup#1490 (comment)
for the full discussion.
* Revert "Remove vendored downstream version of `FindVulkan.cmake`"
This reverts commit 1a672f7.
* Revert "bldsys/toolchain: introduce `ios.cmake` toolchain file"
This reverts commit 6f1680f.
* Revert "build.yml: update workflow for iOS CI to use ios toolchain file"
This reverts commit 265d313.
* bldsys/cmake/module/FindVulkan.cmake: Backport upstream changes
Backport these patches into our downstream `FindVulkan` CMake module:
5e1440302a FindVulkan: Add support for cross-compiling between Windows x64/ARM64
f9a09f76f3 FindVulkan: Drop support for 32-bit SDK on Windows
b40740f28a FindVulkan: Do not search bin directories for libraries
947adbba91 FindVulkan: Use ENV{VULKAN_SDK} only if it exists
This allows proper libraries discovery of Vulkan Libraries on Windows,
both for x86_64 and ARM64 targets.
Co-Authored-By: Brad King <brad.king@kitware.com>
Tested-By: Giancane, Francesco <fgiancan@qti.qualcomm.com>
* Fix wrong copyright years. Add license attributions for my changes.
* app/CMakeLists.txt: restore file to its original content
Changes are addressed in KhronosGroup#1500.
* 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.
---------
Co-authored-by: Brad King <brad.king@kitware.com>FindVulkan.cmake to cross-compile for Windows/Windows on ARM64 (KhronosGroup#1490)1 parent b8189a6 commit f9b1603
1 file changed
Lines changed: 45 additions & 27 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
| 2 | + | |
2 | 3 | | |
3 | 4 | | |
4 | 5 | | |
| |||
263 | 264 | | |
264 | 265 | | |
265 | 266 | | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | | - | |
278 | | - | |
279 | | - | |
280 | | - | |
281 | | - | |
282 | | - | |
283 | | - | |
284 | | - | |
285 | | - | |
286 | | - | |
287 | | - | |
288 | | - | |
289 | 267 | | |
290 | 268 | | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
291 | 275 | | |
292 | | - | |
| 276 | + | |
293 | 277 | | |
294 | 278 | | |
295 | | - | |
| 279 | + | |
296 | 280 | | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
297 | 314 | | |
298 | | - | |
| 315 | + | |
299 | 316 | | |
| 317 | + | |
300 | 318 | | |
301 | 319 | | |
302 | 320 | | |
| |||
0 commit comments