From 5c40e5ddb46ea59aaa0fbd33d9c28d1c9b69dc62 Mon Sep 17 00:00:00 2001 From: pheonix xx Date: Sat, 25 Apr 2020 20:58:50 -0700 Subject: FindVulkan: Prefer VULKAN_SDK env var before standard paths Reference the environment variable as HINTS instead of PATHS. Fixes: #20637 --- Modules/FindVulkan.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Modules/FindVulkan.cmake') diff --git a/Modules/FindVulkan.cmake b/Modules/FindVulkan.cmake index 55da55f761..760312465c 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 -- cgit v1.2.1