diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2022-08-23 16:36:05 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-08-23 10:04:07 -0700 |
commit | 1aecfce30f6c529e8465e837820e40c6da77b603 (patch) | |
tree | 2ca703b19ea2b0b1ee932306e7664390d26e7eed /meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch | |
parent | 8cb8931757214d63c9140cdba83ee5dfc968bc28 (diff) | |
download | meta-openembedded-contrib-1aecfce30f6c529e8465e837820e40c6da77b603.tar.gz |
ade: upgrade 0.1.1f -> 0.1.2
0001-use-GNUInstallDirs-for-detecting-install-paths.patch
removed since it's included in 0.1.2
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch')
-rw-r--r-- | meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch b/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch deleted file mode 100644 index f038b0aa91..0000000000 --- a/meta-oe/recipes-support/opencv/ade/0001-use-GNUInstallDirs-for-detecting-install-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 67ccf77d97b76e8260c9d793ab172577e2393dbc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 19 Dec 2019 21:33:46 -0800 -Subject: [PATCH] use GNUInstallDirs for detecting install paths - -This helps with multilib builds - -Upstream-Status: Submitted [https://github.com/opencv/ade/pull/19] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sources/ade/CMakeLists.txt | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/sources/ade/CMakeLists.txt b/sources/ade/CMakeLists.txt -index 2d1dd20..46415d1 100644 ---- a/sources/ade/CMakeLists.txt -+++ b/sources/ade/CMakeLists.txt -@@ -47,12 +47,14 @@ if(BUILD_ADE_DOCUMENTATION) - VERBATIM) - endif() - -+include(GNUInstallDirs) -+ - install(TARGETS ade COMPONENT dev - EXPORT adeTargets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -- INCLUDES DESTINATION include) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - install(EXPORT adeTargets DESTINATION share/ade COMPONENT dev) - --- -2.24.1 - |