From 34465f30de70151d37d06260e6376d58fa74f60a Mon Sep 17 00:00:00 2001 From: Thierry Moreau Date: Wed, 16 Sep 2020 18:11:55 -0700 Subject: [PATCH] extending FindVulkan to build RPC server on Windows correctly (#6498) Co-authored-by: Mei Ye Co-authored-by: Mei Ye --- cmake/util/FindVulkan.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/util/FindVulkan.cmake b/cmake/util/FindVulkan.cmake index 9d9a973c6558..00ed7dc61716 100644 --- a/cmake/util/FindVulkan.cmake +++ b/cmake/util/FindVulkan.cmake @@ -65,8 +65,8 @@ macro(find_vulkan use_vulkan) HINTS ${VULKAN_LIBRARY_PATH} ${VULKAN_LIBRARY_PATH}/spirv-tools ${VULKAN_SDK}/lib) find_path(_libspirv libspirv.h HINTS ${Vulkan_INCLUDE_DIRS} PATH_SUFFIXES vulkan spirv-tools) - find_path(_spirv spirv.hpp HINTS ${Vulkan_INCLUDE_DIRS} PATH_SUFFIXES vulkan SPIRV spirv/unified1) - find_path(_glsl_std GLSL.std.450.h HINTS ${Vulkan_INCLUDE_DIRS} PATH_SUFFIXES vulkan SPIRV spirv/unified1) + find_path(_spirv spirv.hpp HINTS ${Vulkan_INCLUDE_DIRS} PATH_SUFFIXES vulkan SPIRV spirv/unified1 spirv-headers) + find_path(_glsl_std GLSL.std.450.h HINTS ${Vulkan_INCLUDE_DIRS} PATH_SUFFIXES vulkan SPIRV spirv/unified1 spirv-headers) list(APPEND Vulkan_INCLUDE_DIRS ${_libspirv} ${_spirv} ${_glsl_std}) message(STATUS "Vulkan_INCLUDE_DIRS=" ${Vulkan_INCLUDE_DIRS}) message(STATUS "Vulkan_LIBRARY=" ${Vulkan_LIBRARY})