diff options
| author | Ahsan Hussain <ahsan_hussain@mentor.com> | 2017-09-19 14:28:38 +0500 |
|---|---|---|
| committer | Ahsan Hussain <ahsan_hussain@mentor.com> | 2017-09-19 15:46:13 +0500 |
| commit | 1406dd8aa53dd03c4352d815a5eed2f3c996c20d (patch) | |
| tree | 15267acc941c21e13935201aea1b369b9d2cb7e6 /meta-amdfalconx86 | |
| parent | 7c8c37ab2fa136876914a69cc8b7a5a43c622c86 (diff) | |
| download | meta-amd-1406dd8aa53dd03c4352d815a5eed2f3c996c20d.tar.gz meta-amd-1406dd8aa53dd03c4352d815a5eed2f3c996c20d.tar.bz2 meta-amd-1406dd8aa53dd03c4352d815a5eed2f3c996c20d.zip | |
vulkan-tools: Enable vktraceviewer, iff Qt layers are enabled
This tool was not enabled and would cause configuration issue when Qt layers
are configured in the build.
Signed-off-by: Ahsan Hussain <ahsan_hussain@mentor.com>
Diffstat (limited to 'meta-amdfalconx86')
2 files changed, 38 insertions, 1 deletions
diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch new file mode 100644 index 00000000..d665785d --- /dev/null +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools/0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch @@ -0,0 +1,35 @@ +From 233ba185542405bc38ecb01d1dd90881056291cf Mon Sep 17 00:00:00 2001 +From: Ahsan Hussain <ahsan_hussain@mentor.com> +Date: Tue, 19 Sep 2017 13:59:27 +0500 +Subject: [PATCH 1/1] CMakeLists: add include paths for xcb and Xlib + +--- + vktrace/src/vktrace_viewer/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/vktrace/src/vktrace_viewer/CMakeLists.txt b/vktrace/src/vktrace_viewer/CMakeLists.txt +index dfe2a48..7fbfa12 100644 +--- a/vktrace/src/vktrace_viewer/CMakeLists.txt ++++ b/vktrace/src/vktrace_viewer/CMakeLists.txt +@@ -22,6 +22,9 @@ else() + find_package(Threads REQUIRED) + find_package(X11 REQUIRED) + ++find_path(XCB_INCLUDE_DIR xcb/xcb.h DOC "Path to xcb/xcb.h") ++find_path(X11_XLIB_INCLUDE_DIR X11/Xlib.h DOC "Path to X11/Xlib.h") ++ + require_pthreads() + + include_directories( +@@ -33,6 +36,8 @@ include_directories( + ${SRC_DIR}/vktrace_viewer + ${CMAKE_CURRENT_BINARY_DIR} + ${Qt5Widgets_INCLUDE_DIRS} ++ ${X11_XLIB_INCLUDE_DIR} ++ ${XCB_INCLUDE_DIR} + ) + + set(SRC_LIST +-- +2.11.1 + diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb index c7e65dfe..b5c0b85c 100644 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-tools_1.0.26.bb @@ -22,7 +22,9 @@ SRC_URI = "git://github.com/LunarG/VulkanTools;branch=sdk-${PV} \ file://0001-CMakeLists-add-include-path-so-Xlib.h-is-found-as-ne.patch \ file://0002-obey-CMAKE_INSTALL_LIBDIR.patch \ file://0003-vktrace-do-not-link-to-internal-loader.patch\ - file://0004-json-correct-layer-lib-paths.patch" + file://0004-json-correct-layer-lib-paths.patch \ + file://0005-CMakeLists-add-include-paths-for-xcb-and-Xlib.patch \ +" EXTRA_OECMAKE = " \ -DBUILD_LOADER=0 \ |