diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-11-02 17:47:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-03 08:21:10 +0000 |
commit | a9973bb87db8968ca1cf9ed4a9484b0bfa214b2a (patch) | |
tree | 074509e8d17c3ec3e7afe39533cb10b07f588602 /meta/recipes-graphics/vulkan/vulkan-samples | |
parent | 2a157f114c0fd956bbaf004f1c5bee8a7d42ecf0 (diff) | |
download | poky-a9973bb87db8968ca1cf9ed4a9484b0bfa214b2a.tar.gz |
vulkan-samples: replace vulkan-demos
vulkan-samples is the official collection, and vulkan-demos
author has stated that he will be mostly contributing there:
https://github.com/SaschaWillems/Vulkan#Khronossamples
(From OE-Core rev: 76a25391d09de06f832c1053d3dbc901dee3b912)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan/vulkan-samples')
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch new file mode 100644 index 0000000000..90fe277a41 --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 5fb216d35b6846074196e80421f3162df3b9c8cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 1 Nov 2020 23:19:22 +0000 | ||
4 | Subject: [PATCH] CMakeLists.txt: do not hardcode 'lib' as installation target | ||
5 | |||
6 | Upstream-Status: Inappropriate [already fixed in newer versions] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | CMakeLists.txt | 4 ++-- | ||
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index e00f8c77..f9896eed 100644 | ||
14 | --- a/third_party/spirv-cross/CMakeLists.txt | ||
15 | +++ b/third_party/spirv-cross/CMakeLists.txt | ||
16 | @@ -67,8 +67,8 @@ macro(spirv_cross_add_library name config_name) | ||
17 | install(TARGETS ${name} | ||
18 | EXPORT ${config_name}Config | ||
19 | RUNTIME DESTINATION bin | ||
20 | - LIBRARY DESTINATION lib | ||
21 | - ARCHIVE DESTINATION lib | ||
22 | + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
23 | + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
24 | PUBLIC_HEADER DESTINATION include/spirv_cross) | ||
25 | install(FILES ${hdrs} DESTINATION include/spirv_cross) | ||
26 | install(EXPORT ${config_name}Config DESTINATION share/${config_name}/cmake) | ||
27 | -- | ||
28 | 2.17.1 | ||
29 | |||