summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch')
-rw-r--r--meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch b/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
deleted file mode 100644
index 5d37da8fe0..0000000000
--- a/meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Dec 2019 07:02:24 -0800
4Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
5
6Upstream-Status: Submitted [https://github.com/google/effcee/pull/36]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 CMakeLists.txt | 1 +
10 effcee/CMakeLists.txt | 4 ++--
11 2 files changed, 3 insertions(+), 2 deletions(-)
12
13--- a/external/effcee/CMakeLists.txt
14+++ b/external/effcee/CMakeLists.txt
15@@ -27,6 +27,7 @@ endif()
16
17 include(cmake/setup_build.cmake)
18 include(cmake/utils.cmake)
19+include(GNUInstallDirs)
20
21 add_subdirectory(third_party)
22 add_subdirectory(effcee)
23--- a/external/effcee/effcee/CMakeLists.txt
24+++ b/external/effcee/effcee/CMakeLists.txt
25@@ -14,8 +14,8 @@ install(
26 DESTINATION
27 include/effcee)
28 install(TARGETS effcee
29- LIBRARY DESTINATION lib
30- ARCHIVE DESTINATION lib)
31+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
32+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
33
34 if(EFFCEE_BUILD_TESTING)
35 add_executable(effcee-test