From: Juan Ramos Date: Tue, 10 Jan 2023 16:57:35 +0000 (-0700) Subject: cmake: Fix usage of Vulkan::Registry X-Git-Tag: upstream/1.3.240~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e1777a8ffbb9b2e784c09a82ecdbc10875825f0;p=platform%2Fupstream%2FVulkan-Loader.git cmake: Fix usage of Vulkan::Registry Vulkan::Registry was deprecated by Vulkan-Headers Use 'VULKAN_HEADERS_REGISTRY_DIRECTORY' instead. closes #1106 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a547b96..479a5757 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -322,17 +322,15 @@ endif() # Optional codegen target if(PYTHONINTERP_FOUND) - get_target_property(VulkanRegistry_DIR Vulkan::Registry INTERFACE_INCLUDE_DIRECTORIES) add_custom_target(VulkanLoader_generated_source COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/generate_source.py - ${VulkanRegistry_DIR} + ${VULKAN_HEADERS_REGISTRY_DIRECTORY} --generated-version ${VulkanHeaders_VERSION} --incremental) else() message("WARNING: VulkanLoader_generated_source target requires python 3") endif() - if(UNIX) target_compile_definitions(loader_common_options INTERFACE FALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}" FALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") diff --git a/scripts/known_good.json b/scripts/known_good.json index 846c416e..cd27e7f2 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.238" + "commit": "5eeb2c4c570ce92f5f48bf667e39e9d4da2ef13a" }, { "name": "googletest",