File vulkan-find.patch of Package OpenUSD
diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
index 0112058e5..0f28fc579 100644
--- a/cmake/defaults/Packages.cmake
+++ b/cmake/defaults/Packages.cmake
@@ -188,38 +188,21 @@ if (PXR_BUILD_IMAGING)
endif()
if (PXR_ENABLE_VULKAN_SUPPORT)
message(STATUS "Enabling experimental feature Vulkan support")
- if (EXISTS $ENV{VULKAN_SDK})
- # Prioritize the VULKAN_SDK includes and packages before any system
- # installed headers. This is to prevent linking against older SDKs
- # that may be installed by the OS.
- # XXX This is fixed in cmake 3.18+
- include_directories(BEFORE SYSTEM $ENV{VULKAN_SDK} $ENV{VULKAN_SDK}/include $ENV{VULKAN_SDK}/lib $ENV{VULKAN_SDK}/source)
- set(ENV{PATH} "$ENV{VULKAN_SDK}:$ENV{VULKAN_SDK}/include:$ENV{VULKAN_SDK}/lib:$ENV{VULKAN_SDK}/source:$ENV{PATH}")
- find_package(Vulkan REQUIRED)
- list(APPEND VULKAN_LIBS Vulkan::Vulkan)
-
- # Find the extra vulkan libraries we need
- set(EXTRA_VULKAN_LIBS shaderc_combined)
- if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
- set(EXTRA_VULKAN_LIBS shaderc_combinedd)
- endif()
- foreach(EXTRA_LIBRARY ${EXTRA_VULKAN_LIBS})
- find_library("${EXTRA_LIBRARY}_PATH" NAMES "${EXTRA_LIBRARY}" PATHS $ENV{VULKAN_SDK}/lib)
- list(APPEND VULKAN_LIBS "${${EXTRA_LIBRARY}_PATH}")
- endforeach()
-
- # Find the OS specific libs we need
- if (UNIX AND NOT APPLE)
- find_package(X11 REQUIRED)
- list(APPEND VULKAN_LIBS ${X11_LIBRARIES})
- elseif (WIN32)
- # No extra libs required
- endif()
-
- add_definitions(-DPXR_VULKAN_SUPPORT_ENABLED)
- else()
- message(FATAL_ERROR "VULKAN_SDK not valid")
+ find_package(Vulkan REQUIRED)
+ list(APPEND VULKAN_LIBS Vulkan::Vulkan)
+
+ # Find the extra vulkan libraries we need
+ set(EXTRA_VULKAN_LIBS shaderc_combined)
+
+ # Find the OS specific libs we need
+ if (UNIX AND NOT APPLE)
+ find_package(X11 REQUIRED)
+ list(APPEND VULKAN_LIBS ${X11_LIBRARIES})
+ elseif (WIN32)
+ # No extra libs required
endif()
+
+ add_definitions(-DPXR_VULKAN_SUPPORT_ENABLED)
endif()
# --Opensubdiv
set(OPENSUBDIV_USE_GPU ${PXR_BUILD_GPU_SUPPORT})