repo: Use version from FindVulkanHeaders in build

Change-Id: I565d2e49d965588404ad9ad4ce21f59b3a5abc00

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5dc17fe4b3b2fe085d89986023ef6b45632368f..4fbb795e6d991a3aa25d6baed46b26a9e0f528e0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,15 +210,6 @@ endif()
 
 add_definitions(-DAPI_NAME="Vulkan")
 
-# Fetch header version from vulkan_core.h
-file(STRINGS "${VulkanHeaders_INCLUDE_DIRS}/vulkan/vulkan_core.h" lines REGEX "^#define VK_HEADER_VERSION [0-9]+")
-list(LENGTH lines len)
-if(${len} EQUAL 1)
-    string(REGEX MATCHALL "[0-9]+" vk_header_version ${lines})
-else()
-    message(FATAL_ERROR "Unable to fetch version from vulkan.h")
-endif()
-
 if(BUILD_LOADER)
     add_subdirectory(loader)
 endif()

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index b8c806598f7c26f158f431ffdb5f75726ddfa3ab..f0ab247380c4fe0b5a650a8fd625451bcb870c8e 100644 (file)
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -222,7 +222,7 @@ else()
     add_library(vulkan SHARED ${NORMAL_LOADER_SRCS} ${OPT_LOADER_SRCS})
     add_dependencies(vulkan generate_helper_files loader_gen_files loader_asm_gen_files)
     target_compile_definitions(vulkan PUBLIC -DLOADER_DYNAMIC_LIB)
-    set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.1.${vk_header_version}")
+    set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
     target_link_libraries(vulkan -ldl -lpthread -lm)
 
     if(APPLE)
@@ -263,7 +263,7 @@ else()
             OUTPUT_NAME vulkan
             FRAMEWORK TRUE
             FRAMEWORK_VERSION A
-            VERSION "1.1.${vk_header_version}"       # "current version"
+            VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}" # "current version"
             SOVERSION "1.0.0"                        # "compatibility version"
             MACOSX_FRAMEWORK_IDENTIFIER com.lunarg.vulkanFramework
             PUBLIC_HEADER "${FRAMEWORK_HEADERS}"
@@ -279,7 +279,7 @@ else()
         # Generate pkg-config file.
         include(FindPkgConfig QUIET)
         if(PKG_CONFIG_FOUND)
-            set(VK_API_VERSION "1.1.${vk_header_version}")
+            set(VK_API_VERSION "${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}")
             foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
                 set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
             endforeach()

diff --git a/tests/layers/CMakeLists.txt b/tests/layers/CMakeLists.txt
index 78e45b3381d5fecff106193ccccb651e73b434b7..39a0b6b8c4b0b15a68dfe04ea50eec2adc15d104 100644 (file)
--- a/tests/layers/CMakeLists.txt
+++ b/tests/layers/CMakeLists.txt
@@ -81,7 +81,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/generator.cmake" "configure_file(\"\${IN
 foreach(TARGET_NAME ${TARGET_NAMES})
     set(CONFIG_DEFINES
         -DINPUT_FILE="${CMAKE_CURRENT_SOURCE_DIR}/json/${TARGET_NAME}.json.in"
-        -DVK_VERSION=1.1.${vk_header_version}
+        -DVK_VERSION="${VulkanHeaders_VERSION_MAJOR}.${VulkanHeaders_VERSION_MINOR}.${VulkanHeaders_VERSION_PATCH}"
     )
     # If this json file is not a metalayer, get the needed properties from that target
     if(TARGET ${TARGET_NAME})