[Bf-blender-cvs] [86868a4bcc4] temp-ghost-vulkan: Changes to cmake to select vulkan from libs.

[Jeroen Bakker]

Commit: 86868a4bcc4cfda2b901f6af0bfe158f0603e901
Author: Jeroen Bakker
Date:   Tue Nov 1 12:00:28 2022 +0100
Branches: temp-ghost-vulkan
https://developer.blender.org/rB86868a4bcc4cfda2b901f6af0bfe158f0603e901

Changes to cmake to select vulkan from libs.

===================================================================

M	CMakeLists.txt
D	build_files/cmake/Modules/FindVulkan.cmake
M	build_files/cmake/platform/platform_win32.cmake

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96510ab0e85..907400a3713 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1231,7 +1231,7 @@ endif()
 # Configure Vulkan.
 
 if(WITH_VULKAN_BACKEND)
-  list(APPEND BLENDER_GL_LIBRARIES ${Vulkan_LIBRARY})
+  list(APPEND BLENDER_GL_LIBRARIES ${VULKAN_LIBRARIES})
 
   add_definitions(-DWITH_VULKAN_BACKEND)
 endif()
diff --git a/build_files/cmake/Modules/FindVulkan.cmake b/build_files/cmake/Modules/FindVulkan.cmake
deleted file mode 100644
index e8e75ddffb3..00000000000
--- a/build_files/cmake/Modules/FindVulkan.cmake
+++ /dev/null
@@ -1,63 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2022 Blender Foundation.
-
-# - Find Vulkan library
-# Find the native USD includes and libraries
-# This module defines
-#  VULKAN_INCLUDE_DIRS, where to find Vulkan headers.
-#  VULKAN_LIBRARIES, libraries to link against to use USD.
-#  VULKAN_ROOT_DIR, The base directory to search for USD.
-#                    This can also be an environment variable.
-#  VULKAN_FOUND, If false, do not try to use USD.
-#
-
-# If VULKAN_ROOT_DIR was defined in the environment, use it.
-IF(NOT VULKAN_ROOT_DIR AND NOT $ENV{VULKAN_ROOT_DIR} STREQUAL "")
- SET(VULKAN_ROOT_DIR $ENV{VULKAN_ROOT_DIR})
-ENDIF()
-
-SET(_vulkan_SEARCH_DIRS
-  ${VULKAN_ROOT_DIR}
-)
-
-FIND_PATH(VULKAN_INCLUDE_DIR
-  NAMES
-    MoltenVK/vk_mvk_moltenvk.h
-    
-  HINTS
-    ${_vulkan_SEARCH_DIRS}/MoltenVK/
-  PATH_SUFFIXES
-    include
-  DOC "MoltenVK header files"
-)
-
-FIND_LIBRARY(VULKAN_LIBRARY
-  NAMES
-    MoltenVK
-  NAMES_PER_DIR
-  HINTS
-    ${_vulkan_SEARCH_DIRS}/MoltenVK/dylib/
-  PATH_SUFFIXES
-    macOS
-  DOC "MolkenVK MacOS Vulkan translation layer library"
-)
-
-IF(${VULKAN_LIBRARY_NOTFOUND})
-  SET(VULKAN_FOUND FALSE)
-ELSE()
-  INCLUDE(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(VULKAN DEFAULT_MSG VULKAN_LIBRARY VULKAN_INCLUDE_DIR)
-
-  IF(VULKAN_FOUND)
-    SET(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR})
-    SET(VULKAN_LIBRARIES ${VULKAN_LIBRARY})
-  ENDIF()
-
-ENDIF()
-
-MARK_AS_ADVANCED(
-  VULKAN_INCLUDE_DIR
-  VULKAN_LIBRARY
-)
-
-UNSET(_vulkan_SEARCH_DIRS)
\ No newline at end of file
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index d439c7de5de..da286fc29d5 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -918,14 +918,14 @@ endif()
 
 if(WITH_VULKAN_BACKEND)
   if(EXISTS ${LIBDIR}/vulkan)
-    set(Vulkan_FOUND On)
-    set(Vulkan_ROOT_DIR ${LIBDIR}/vulkan)
-    set(Vulkan_INCLUDE_DIR ${Vulkan_ROOT_DIR}/include)
-    set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR})
-    set(Vulkan_LIBRARY ${Vulkan_ROOT_DIR}/lib/vulkan-1.lib)
-    set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})
+    set(VULKAN_FOUND On)
+    set(VULKAN_ROOT_DIR ${LIBDIR}/vulkan)
+    set(VULKAN_INCLUDE_DIR ${VULKAN_ROOT_DIR}/include)
+    set(VULKAN_INCLUDE_DIRS ${VULKAN_INCLUDE_DIR})
+    set(VULKAN_LIBRARY ${VULKAN_ROOT_DIR}/lib/vulkan-1.lib)
+    set(VULKAN_LIBRARIES ${VULKAN_LIBRARY})
   else()
-    message(WARNING "vulkan was not found, disabling WITH_VULKAN_BACKEND")
+    message(WARNING "Vulkan was not found, disabling WITH_VULKAN_BACKEND")
     set(WITH_VULKAN_BACKEND OFF)
   endif()
 endif()