commit 16d17ebf3762f24b3eb06e04843efb7f7dbf8438
author Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> Tue Dec 10 11:23:23 2019 -0800
committer Lenny Komow <lenny@lunarg.com> Thu Dec 12 10:11:46 2019 -0700
tree 55b10bfb3b14710437a7d7190ec2abb5ecb084d9
parent ff77404307834b27ae70ff0679a09dc8def31118

build: Fix Vulkan registry detection

Fix incomplete VULKAN_REGISTRY_PATH_HINT for the case where
VULKAN_HEADERS_INSTALL_DIR is not specified.  The hint extracted the
DIRECTORY of the include dir (e.g. "/usr"), but missed the rest of the
expected path for finding vk.xml (e.g. "/usr/share/vulkan/registry").

Tested with CMake 3.16.0.

Fixes: 18664450a ("build: Fix Vulkan headers detection with CMake.")

cmake/FindVulkanHeaders.cmake

diff --git a/cmake/FindVulkanHeaders.cmake b/cmake/FindVulkanHeaders.cmake
index 68e2611..1c71ffe 100644
--- a/cmake/FindVulkanHeaders.cmake
+++ b/cmake/FindVulkanHeaders.cmake
@@ -76,7 +76,7 @@
   # do a normal search without hints.
   find_path(VulkanHeaders_INCLUDE_DIR NAMES vulkan/vulkan.h)
   get_filename_component(VULKAN_REGISTRY_PATH_HINT ${VulkanHeaders_INCLUDE_DIR} DIRECTORY)
-  find_path(VulkanRegistry_DIR NAMES vk.xml HINTS ${VULKAN_REGISTRY_PATH_HINT})
+  find_path(VulkanRegistry_DIR NAMES vk.xml HINTS ${VULKAN_REGISTRY_PATH_HINT}/share/vulkan/registry)
 endif()
 
 set(VulkanHeaders_INCLUDE_DIRS ${VulkanHeaders_INCLUDE_DIR})