From bf6551a3cab44d3bb2dae0d782dfa1fcef1c699c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Sun, 27 May 2018 19:31:50 +0200 Subject: [PATCH] Cocoa: Fix FindVulkan.cmake paths for LunarG SDK Fixes #1278. --- CMake/modules/FindVulkan.cmake | 5 ----- docs/vulkan.dox | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CMake/modules/FindVulkan.cmake b/CMake/modules/FindVulkan.cmake index 103554bb..5004356b 100644 --- a/CMake/modules/FindVulkan.cmake +++ b/CMake/modules/FindVulkan.cmake @@ -27,11 +27,6 @@ if (WIN32) "$ENV{VULKAN_SDK}/Bin32" "$ENV{VK_SDK_PATH}/Bin32") endif() -elseif (APPLE) - find_library(VULKAN_LIBRARY vulkan.1 HINTS - "$ENV{VULKAN_SDK}/macOS/lib") - find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS - "$ENV{VULKAN_SDK}/macOS/include") else() find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS "$ENV{VULKAN_SDK}/include") diff --git a/docs/vulkan.dox b/docs/vulkan.dox index bda99c16..99624516 100644 --- a/docs/vulkan.dox +++ b/docs/vulkan.dox @@ -44,12 +44,14 @@ a compile-time error. @macos Because the Vulkan loader and ICD are not installed globally on macOS, you need to set up the application bundle according to the LunarG SDK documentation. To help the GLFW CMake files find the SDK, you can set the -`VULKAN_SDK` environment variable. +`VULKAN_SDK` environment variable to the `macOS` subdirectory of the SDK. @code{.sh} -env VULKAN_SDK=/example/path/to/vulkansdk-macos cmake . +env VULKAN_SDK=/example/path/to/vulkansdk/macOS cmake . @endcode +This is explained in more detail in the LunarG Vulkan SDK release notes. + @section vulkan_include Including the Vulkan and GLFW header files