Initial commit
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -122,7 +122,7 @@ if (TARGET Vulkan::Headers)
|
||||
get_target_property(VulkanHeaders_INCLUDE_DIRS Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
|
||||
get_target_property(VulkanRegistry_DIR Vulkan::Registry INTERFACE_INCLUDE_DIRECTORIES)
|
||||
else()
|
||||
- find_package(VulkanHeaders REQUIRED)
|
||||
+ find_package(VulkanHeaders REQUIRED MODULE)
|
||||
|
||||
# xxxnsubtil: this should eventually be replaced by exported targets
|
||||
add_library(Vulkan-Headers INTERFACE)
|
||||
@@ -174,7 +174,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
|
||||
endif()
|
||||
|
||||
if(BUILD_WSI_WAYLAND_SUPPORT)
|
||||
- find_package(Wayland REQUIRED)
|
||||
+ find_package(Wayland REQUIRED MODULE)
|
||||
include_directories(${WAYLAND_CLIENT_INCLUDE_DIR})
|
||||
endif()
|
||||
endif()
|
||||
--- a/cmake/FindVulkanHeaders.cmake
|
||||
+++ b/cmake/FindVulkanHeaders.cmake
|
||||
@@ -62,7 +62,7 @@ if(DEFINED VULKAN_HEADERS_INSTALL_DIR)
|
||||
NO_CMAKE_FIND_ROOT_PATH)
|
||||
find_path(VulkanRegistry_DIR
|
||||
NAMES vk.xml
|
||||
- HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry
|
||||
+ HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry ${VULKAN_HEADERS_INSTALL_DIR}/res/vulkan/registry
|
||||
NO_CMAKE_FIND_ROOT_PATH)
|
||||
else()
|
||||
# If VULKAN_HEADERS_INSTALL_DIR, or one of its variants was not specified,
|
||||
@@ -0,0 +1,31 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -122,7 +122,7 @@ if (TARGET Vulkan::Headers)
|
||||
get_target_property(VulkanHeaders_INCLUDE_DIRS Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
|
||||
get_target_property(VulkanRegistry_DIR Vulkan::Registry INTERFACE_INCLUDE_DIRECTORIES)
|
||||
else()
|
||||
- find_package(VulkanHeaders REQUIRED)
|
||||
+ find_package(VulkanHeaders REQUIRED MODULE)
|
||||
|
||||
# xxxnsubtil: this should eventually be replaced by exported targets
|
||||
add_library(Vulkan-Headers INTERFACE)
|
||||
@@ -174,7 +174,7 @@ if(UNIX AND NOT APPLE) # i.e. Linux
|
||||
endif()
|
||||
|
||||
if(BUILD_WSI_WAYLAND_SUPPORT)
|
||||
- find_package(Wayland REQUIRED)
|
||||
+ find_package(Wayland REQUIRED MODULE)
|
||||
include_directories(${WAYLAND_CLIENT_INCLUDE_DIR})
|
||||
endif()
|
||||
endif()
|
||||
--- a/cmake/FindVulkanHeaders.cmake
|
||||
+++ b/cmake/FindVulkanHeaders.cmake
|
||||
@@ -63,7 +63,7 @@ if(DEFINED VULKAN_HEADERS_INSTALL_DIR)
|
||||
NO_DEFAULT_PATH)
|
||||
find_path(VulkanRegistry_DIR
|
||||
NAMES vk.xml
|
||||
- HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry
|
||||
+ HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry ${VULKAN_HEADERS_INSTALL_DIR}/res/vulkan/registry
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
NO_DEFAULT_PATH)
|
||||
else()
|
||||
@@ -0,0 +1,30 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -103,7 +103,7 @@ if (GOOGLETEST_INSTALL_DIR)
|
||||
list(APPEND CMAKE_PREFIX_PATH ${GOOGLETEST_INSTALL_DIR})
|
||||
endif()
|
||||
|
||||
-find_package(VulkanHeaders REQUIRED)
|
||||
+find_package(VulkanHeaders REQUIRED MODULE)
|
||||
add_library(Vulkan-Headers INTERFACE)
|
||||
target_include_directories(Vulkan-Headers INTERFACE ${VulkanHeaders_INCLUDE_DIRS})
|
||||
add_library(Vulkan::Headers ALIAS Vulkan-Headers)
|
||||
@@ -229,7 +229,6 @@ if(BUILD_LAYERS OR BUILD_TESTS)
|
||||
endif()
|
||||
|
||||
# VVLGenerateSourceCode depends on spirv/unified1
|
||||
- include(VVLGenerateSourceCode)
|
||||
|
||||
if (NOT TARGET SPIRV-Tools-opt)
|
||||
find_package(SPIRV-Tools-opt REQUIRED CONFIG)
|
||||
--- a/cmake/FindVulkanHeaders.cmake
|
||||
+++ b/cmake/FindVulkanHeaders.cmake
|
||||
@@ -63,7 +63,7 @@ if(DEFINED VULKAN_HEADERS_INSTALL_DIR)
|
||||
NO_DEFAULT_PATH)
|
||||
find_path(VulkanRegistry_DIR
|
||||
NAMES vk.xml
|
||||
- HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry
|
||||
+ HINTS ${VULKAN_HEADERS_INSTALL_DIR}/share/vulkan/registry ${VULKAN_HEADERS_INSTALL_DIR}/res/vulkan/registry
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
NO_DEFAULT_PATH)
|
||||
else()
|
||||
@@ -0,0 +1,13 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -171,9 +171,7 @@ if(${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
|
||||
-fno-builtin-memcmp)
|
||||
|
||||
# Treat warnings as errors for versions of GCC and c++11-compliant Clang versions that are shipped on Ubuntu 18.04 or older.
|
||||
- if(BUILD_WERROR OR
|
||||
- (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 7.3.0) OR
|
||||
- (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0.0))
|
||||
+ if(BUILD_WERROR)
|
||||
add_compile_options(-Werror)
|
||||
endif()
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -230,7 +230,6 @@ endif()
|
||||
if(BUILD_LAYERS OR BUILD_TESTS)
|
||||
find_package(SPIRV-Headers REQUIRED CONFIG QUIET)
|
||||
|
||||
- include(VVLGenerateSourceCode)
|
||||
|
||||
find_package(SPIRV-Tools-opt REQUIRED CONFIG QUIET)
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/layers/CMakeLists.txt
|
||||
+++ b/layers/CMakeLists.txt
|
||||
@@ -134,7 +134,7 @@ endif()
|
||||
|
||||
find_package(PythonInterp 3 QUIET)
|
||||
|
||||
-if (PYTHONINTERP_FOUND)
|
||||
+if (0)
|
||||
# Get the include directory of the SPIRV-Headers
|
||||
get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/layers/CMakeLists.txt
|
||||
+++ b/layers/CMakeLists.txt
|
||||
@@ -115,7 +115,7 @@ endif()
|
||||
|
||||
find_package(PythonInterp 3 QUIET)
|
||||
|
||||
-if (PYTHONINTERP_FOUND)
|
||||
+if (0)
|
||||
# Get the include directory of the SPIRV-Headers
|
||||
get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
|
||||
|
||||
Reference in New Issue
Block a user