Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 03:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: Fix FindVulkan.cmake paths for LunarG SDK

Browse Source 
Fixes #1278.
This commit is contained in:
Camilla Löwy 2018-05-27 19:31:50 +02:00
parent 617a322bd8
commit bf6551a3ca
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMake/modules/FindVulkan.cmake
View File

@ -27,11 +27,6 @@ if (WIN32)
"$ENV{VULKAN_SDK}/Bin32" "$ENV{VULKAN_SDK}/Bin32"
"$ENV{VK_SDK_PATH}/Bin32") "$ENV{VK_SDK_PATH}/Bin32")
endif() 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() else()
find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS find_path(VULKAN_INCLUDE_DIR NAMES vulkan/vulkan.h HINTS
"$ENV{VULKAN_SDK}/include") "$ENV{VULKAN_SDK}/include")

6
docs/vulkan.dox
View File

@ -44,12 +44,14 @@ a compile-time error.
@macos Because the Vulkan loader and ICD are not installed globally on macOS, @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 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 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} @code{.sh}
env VULKAN_SDK=/example/path/to/vulkansdk-macos cmake . env VULKAN_SDK=/example/path/to/vulkansdk/macOS cmake .
@endcode @endcode
This is explained in more detail in the LunarG Vulkan SDK release notes.
@section vulkan_include Including the Vulkan and GLFW header files @section vulkan_include Including the Vulkan and GLFW header files