diff options
Diffstat (limited to 'meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch')
| -rw-r--r-- | meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch index df871c68..10337189 100644 --- a/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch +++ b/meta-v1000/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch @@ -1,7 +1,7 @@ -From 31f4c33da2d988f2ac3d3f2cdd97cae4085abe19 Mon Sep 17 00:00:00 2001 +From 49d4dd326b9d4b7b013f4a1d21498568d76443b2 Mon Sep 17 00:00:00 2001 From: Awais Belal <awais_belal@mentor.com> -Date: Wed, 31 May 2017 13:26:39 +0500 -Subject: [PATCH 1/3] CMakeLists: add include path so Xlib.h is found as needed +Date: Tue, 4 Sep 2018 14:09:12 +0500 +Subject: [PATCH 1/5] CMakeLists: add include path so Xlib.h is found as needed All the targets including vk_platform.h or directly including X11/Xlib.h require to know the directory for the installed @@ -11,18 +11,18 @@ filled in properly. Signed-off-by: Awais Belal <awais_belal@mentor.com> --- CMakeLists.txt | 2 ++ - demos/CMakeLists.txt | 2 +- + demos/CMakeLists.txt | 1 + layers/CMakeLists.txt | 1 + libs/vkjson/CMakeLists.txt | 1 + loader/CMakeLists.txt | 1 + - 5 files changed, 6 insertions(+), 1 deletion(-) + 5 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b53696fb0..2d97f7a0d 100644 +index 5cf85d487..5ce69d216 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,6 +187,8 @@ find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURC - "${EXTERNAL_SOURCE_ROOT}/source/spirv-tools/external/include" +@@ -225,6 +225,8 @@ find_path(SPIRV_TOOLS_INCLUDE_DIR spirv-tools/libspirv.h HINTS "${EXTERNAL_SOURC + "${CMAKE_SOURCE_DIR}/../glslang/External/spirv-tools/include" DOC "Path to spirv-tools/libspirv.h") +find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") @@ -31,25 +31,24 @@ index b53696fb0..2d97f7a0d 100644 HINTS ${GLSLANG_SEARCH_PATH} ) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index 917ea8840..472d1528b 100644 +index 487b19910..fb5022bf5 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -19,7 +19,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - if (NOT BUILD_WSI_XLIB_SUPPORT) - message( FATAL_ERROR "Selected XLIB for demos build but not building Xlib support" ) - endif() -- include_directories(${X11_INCLUDE_DIR}) -+ include_directories(${X11_INCLUDE_DIR} ${X11_XLIB_INCLUDE_DIR}) +@@ -41,6 +41,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(DEMO_INCLUDE_DIRS + ${X11_INCLUDE_DIR} + ${DEMO_INCLUDE_DIRS} ++ ${X11_XLIB_INCLUDE_DIR} + ) link_libraries(${X11_LIBRARIES}) add_definitions(-DVK_USE_PLATFORM_XLIB_KHR) - elseif(DEMOS_WSI_SELECTION STREQUAL "WAYLAND") diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 7a35df7ec..5543808e5 100644 +index 08b0e2090..6068d0031 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt -@@ -115,6 +115,7 @@ include_directories( +@@ -146,6 +146,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR} + ${X11_XLIB_INCLUDE_DIR} ) @@ -68,12 +67,12 @@ index 2e79d9109..4b1df5988 100644 add_library(vkjson STATIC vkjson.cc vkjson_instance.cc ../../loader/cJSON.c) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt -index d15f09cc9..e7dd6d358 100644 +index 4d1d08fc8..55ae2cb85 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR} + ${X11_XLIB_INCLUDE_DIR} ) |