diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-29 11:32:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-29 11:32:17 (GMT) |
| commit | 505bc9c87ba6a6a2e2494986af52447228fa3918 (patch) | |
| tree | 8362960a29327c0f5dc32093eb125ed0991aba9a | |
| parent | d968ec380b1cc0f26a24924a8228474d62f23267 (diff) | |
| parent | 5c40e5ddb46ea59aaa0fbd33d9c28d1c9b69dc62 (diff) | |
| download | CMake-505bc9c87ba6a6a2e2494986af52447228fa3918.zip CMake-505bc9c87ba6a6a2e2494986af52447228fa3918.tar.gz CMake-505bc9c87ba6a6a2e2494986af52447228fa3918.tar.bz2 | |
Merge topic 'FindVulkan-env-sdk-first'
5c40e5ddb4 FindVulkan: Prefer VULKAN_SDK env var before standard paths
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4663
| -rw-r--r-- | Modules/FindVulkan.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake index 55da55f..7603124 100644 --- a/Modules/FindVulkan.cmake +++ b/Modules/FindVulkan.cmake @@ -33,25 +33,24 @@ The module will also define two cache variables:: if(WIN32) find_path(Vulkan_INCLUDE_DIR NAMES vulkan/vulkan.h - PATHS + HINTS "$ENV{VULKAN_SDK}/Include" ) if(CMAKE_SIZEOF_VOID_P EQUAL 8) find_library(Vulkan_LIBRARY NAMES vulkan-1 - PATHS + HINTS "$ENV{VULKAN_SDK}/Lib" "$ENV{VULKAN_SDK}/Bin" - ) + ) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) find_library(Vulkan_LIBRARY NAMES vulkan-1 - PATHS + HINTS "$ENV{VULKAN_SDK}/Lib32" "$ENV{VULKAN_SDK}/Bin32" - NO_SYSTEM_ENVIRONMENT_PATH - ) + ) endif() else() find_path(Vulkan_INCLUDE_DIR |