Преглед изворни кода

Merge topic 'FindVulkan-tolerate-FATAL_ERROR'

9063674517 Help: Add 3.24 release note about FindVulkan component enforcement
bc01362368 FindVulkan: Restore tolerance of unknown FATAL_ERROR component

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7583
Brad King пре 3 година
родитељ
комит
8ad94b1977
2 измењених фајлова са 15 додато и 0 уклоњено
  1. 5 0
      Help/release/3.24.rst
  2. 10 0
      Modules/FindVulkan.cmake

+ 5 - 0
Help/release/3.24.rst

@@ -317,6 +317,11 @@ Deprecated and Removed Features
 * The :module:`FindGLUT` module no longer provides the undocumented
   ``GLUT_LIBRARY`` and ``GLUT_INCLUDE_PATH`` result variables.
 
+* The :module:`FindVulkan` module no longer silently ignores unknown
+  components requested by a ``find_package(Vulkan REQUIRED ...)`` call.
+  With the addition of support for components, requests for unknown
+  components now produce an error.
+
 Other Changes
 =============
 

+ 10 - 0
Modules/FindVulkan.cmake

@@ -222,6 +222,16 @@ environment.
 cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW)
 
+# Provide compatibility with a common invalid component request that
+# was silently ignored prior to CMake 3.24.
+if("FATAL_ERROR" IN_LIST Vulkan_FIND_COMPONENTS)
+  message(AUTHOR_WARNING
+    "Ignoring unknown component 'FATAL_ERROR'.\n"
+    "The find_package() command documents no such argument."
+    )
+  list(REMOVE_ITEM Vulkan_FIND_COMPONENTS "FATAL_ERROR")
+endif()
+
 # For backward compatibility as `FindVulkan` in previous CMake versions allow to retrieve `glslc`
 # and `glslangValidator` without requesting the corresponding component.
 if(NOT glslc IN_LIST Vulkan_FIND_COMPONENTS)