summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2020-05-13 20:56:48 -0700
committerKhem Raj <raj.khem@gmail.com>2020-05-13 23:40:04 -0700
commit4e494eedfee1ad133cd15912d1b0c59349143904 (patch)
tree6e072a7867ba34eccbe5ba7b04568650bc81ca2b /meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch
parent6105a7bd4dbb8f02d4c70335b3b3480df5268378 (diff)
downloadmeta-openembedded-4e494eedfee1ad133cd15912d1b0c59349143904.tar.gz
cli11: upgrade 1.8.0 -> 1.9.0
Variants of the patches are now included upstream so the local patching can be removed. Signed-off-by: William A. Kennington III <wak@google.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch')
-rw-r--r--meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch b/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch
deleted file mode 100644
index 4541cd929d..0000000000
--- a/meta-oe/recipes-support/cli11/files/0001-Use-GNUInstallDirs-instead-of-hard-coded-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 8c51221f748bca1483fe1141e584867d2ff34a07 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 19 Dec 2019 16:26:39 -0800
4Subject: [PATCH] Use GNUInstallDirs instead of hard-coded path
5
6Upstream-Status: Submitted [https://github.com/CLIUtils/CLI11/pull/373]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 CMakeLists.txt | 5 +++--
10 1 file changed, 3 insertions(+), 2 deletions(-)
11
12diff --git a/CMakeLists.txt b/CMakeLists.txt
13index 7073a0b..5236fd2 100644
14--- a/CMakeLists.txt
15+++ b/CMakeLists.txt
16@@ -120,17 +120,18 @@ endif()
17 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CLI11ConfigVersion.cmake.in"
18 "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake" @ONLY)
19
20+include(GNUInstallDirs)
21 # These installs only make sense for a local project
22 if(CUR_PROJ)
23 # Make version available in the install
24 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CLI11ConfigVersion.cmake"
25- DESTINATION lib/cmake/CLI11)
26+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11)
27
28 # Install the export target as a file
29 install(EXPORT CLI11Targets
30 FILE CLI11Config.cmake
31 NAMESPACE CLI11::
32- DESTINATION lib/cmake/CLI11)
33+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CLI11)
34
35 # Use find_package on the installed package
36 export(TARGETS CLI11
37--
382.24.1
39