[Bf-blender-cvs] [ed2b3824901] temp-ghost-vulkan: Add vulkan changes to cmake files.
Jeroen Bakker
noreply at git.blender.org
Tue Nov 1 08:43:08 CET 2022
Commit: ed2b3824901cb5c886a5bff5e6f7dd799934bdcc
Author: Jeroen Bakker
Date: Wed Oct 19 16:06:18 2022 +0200
Branches: temp-ghost-vulkan
https://developer.blender.org/rBed2b3824901cb5c886a5bff5e6f7dd799934bdcc
Add vulkan changes to cmake files.
===================================================================
M CMakeLists.txt
M build_files/cmake/platform/platform_apple.cmake
M build_files/cmake/platform/platform_unix.cmake
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e89943714a..96510ab0e85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1227,6 +1227,14 @@ if(WITH_OPENGL)
add_definitions(-DWITH_OPENGL)
endif()
+#-----------------------------------------------------------------------------
+# Configure Vulkan.
+
+if(WITH_VULKAN_BACKEND)
+ list(APPEND BLENDER_GL_LIBRARIES ${Vulkan_LIBRARY})
+
+ add_definitions(-DWITH_VULKAN_BACKEND)
+endif()
# -----------------------------------------------------------------------------
# Configure Vulkan.
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index c5fe3c908de..1b6278f6cbb 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -100,6 +100,10 @@ if(WITH_USD)
find_package(USD REQUIRED)
endif()
+if(WITH_VULKAN_BACKEND)
+ find_package_wrapper(Vulkan REQUIRED)
+endif()
+
if(WITH_OPENSUBDIV)
find_package(OpenSubdiv)
endif()
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 343ed6d8ef4..d5b9e91ac7d 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -108,6 +108,10 @@ find_package_wrapper(ZLIB REQUIRED)
find_package_wrapper(Zstd REQUIRED)
find_package_wrapper(Epoxy REQUIRED)
+if(WITH_VULKAN_BACKEND)
+ find_package_wrapper(Vulkan REQUIRED)
+endif()
+
function(check_freetype_for_brotli)
include(CheckSymbolExists)
set(CMAKE_REQUIRED_INCLUDES ${FREETYPE_INCLUDE_DIRS})
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 3818076634a..e321f9120c5 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -916,6 +916,20 @@ if(WITH_HARU)
set(HARU_LIBRARIES ${HARU_ROOT_DIR}/lib/libhpdfs.lib)
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})
+ else()
+ message(WARNING "vulkan was not found, disabling WITH_VULKAN")
+ set(WITH_VULKAN OFF)
+ endif()
+endif()
+
if(WITH_CYCLES AND WITH_CYCLES_PATH_GUIDING)
find_package(openpgl QUIET)
if(openpgl_FOUND)
More information about the Bf-blender-cvs
mailing list