summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/cpprest/cpprest/845.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/cpprest/cpprest/845.patch')
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/845.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta-oe/recipes-support/cpprest/cpprest/845.patch b/meta-oe/recipes-support/cpprest/cpprest/845.patch
deleted file mode 100644
index 8a349aef78..0000000000
--- a/meta-oe/recipes-support/cpprest/cpprest/845.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From c4a09f3d29a57022e03e2849f04c111a57a6a388 Mon Sep 17 00:00:00 2001
2From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
3Date: Sat, 18 Aug 2018 14:59:38 +0200
4Subject: [PATCH] Fix default installation path
5
6---
7 Release/CMakeLists.txt | 2 +-
8 Release/src/CMakeLists.txt | 4 ++--
9 2 files changed, 3 insertions(+), 3 deletions(-)
10
11diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
12index c93d3cc49..d20b4b070 100644
13--- a/Release/CMakeLists.txt
14+++ b/Release/CMakeLists.txt
15@@ -18,7 +18,7 @@ enable_testing()
16 set(WERROR ON CACHE BOOL "Treat Warnings as Errors.")
17 set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.")
18 set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.")
19-set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.")
20+set(CPPREST_EXPORT_DIR cmake CACHE STRING "Directory to install CMake config files.")
21 set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.")
22 set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.")
23
24diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
25index a34605bda..050ff71fc 100644
26--- a/Release/src/CMakeLists.txt
27+++ b/Release/src/CMakeLists.txt
28@@ -262,12 +262,12 @@ if(CPPREST_INSTALL)
29
30 install(
31 FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake"
32- DESTINATION ${CPPREST_EXPORT_DIR}
33+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPPREST_EXPORT_DIR}
34 )
35 install(
36 EXPORT cpprestsdk-targets
37 FILE cpprestsdk-targets.cmake
38 NAMESPACE cpprestsdk::
39- DESTINATION ${CPPREST_EXPORT_DIR}
40+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPPREST_EXPORT_DIR}
41 )
42 endif()