From: Mark Young <marky@lunarg.com>
Date: Thu, 19 Jul 2018 15:48:03 +0000 (-0600)
Subject: loader: Fix detection of patch
X-Git-Tag: submit/tizen/20181227.054638~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fabaa4a74738a1133f199232d0999389c9e5710c;p=platform%2Fupstream%2FVulkan-Loader.git

loader: Fix detection of patch

Karl pointed out that the patch detection wasn't that future proof.
Added his coding suggestions.

Change-Id: Ieedd53776da1835a38ed1815a20775988df94900
---

diff --git a/cmake/FindVulkanHeaders.cmake b/cmake/FindVulkanHeaders.cmake
index 506c4f8d..41afa9b5 100644
--- a/cmake/FindVulkanHeaders.cmake
+++ b/cmake/FindVulkanHeaders.cmake
@@ -121,10 +121,14 @@ foreach(VulkanHeaders_line ${VulkanHeaders_lines})
     #   Format is:
     #      #define VK_HEADER_VERSION Z
     #   Where Z is the patch version which we just grab off the end
-    string(REGEX MATCH "define.*VK_HEADER_VERSION.*" VulkanHeaders_out ${VulkanHeaders_line})
+    string(REGEX MATCH "define.*VK_HEADER_VERSION.*[0-9]+" VulkanHeaders_out ${VulkanHeaders_line})
     list(LENGTH VulkanHeaders_out VulkanHeaders_len)
     if (VulkanHeaders_len)
-        string(REGEX MATCHALL "[0-9]+" VulkanHeaders_VERSION_PATCH "${VulkanHeaders_out}")
+        string(REGEX MATCH "[0-9]+" VulkanHeaders_VERSION_PATCH "${VulkanHeaders_out}")
     endif()
 
 endforeach()
+MESSAGE(STATUS
+        "Detected Vulkan Version ${VulkanHeaders_VERSION_MAJOR}."
+        "${VulkanHeaders_VERSION_MINOR}."
+        "${VulkanHeaders_VERSION_PATCH}")