summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
diff options
context:
space:
mode:
authorGianfranco Costamagna <costamagna.gianfranco@gmail.com>2018-07-23 18:47:54 +0200
committerKhem Raj <raj.khem@gmail.com>2018-07-26 20:10:07 -0700
commitcff57daf6507f4b449e62678606d4988555dc6aa (patch)
treec30229a6ed037a1e7a166a846e6408d806e9f08a /meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
parent4ad49edc90f4ff73a19accda4f12ef33b46effd1 (diff)
downloadmeta-openembedded-cff57daf6507f4b449e62678606d4988555dc6aa.tar.gz
meta-oe: update cpprest with patches uploaded in Debian, add upstream proposed gcc-8 patch, add boost 1.63 build fix patch
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch')
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch50
1 files changed, 46 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
index 0feafef5bf..ab92276804 100644
--- a/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
+++ b/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
@@ -4,14 +4,56 @@ Upstream-Status: https://github.com/Microsoft/cpprestsdk/pull/737
4Forwarded: https://github.com/Microsoft/cpprestsdk/pull/737 4Forwarded: https://github.com/Microsoft/cpprestsdk/pull/737
5Last-Update: 2018-04-19 5Last-Update: 2018-04-19
6 6
7--- cpprest-2.10.2.orig/CMakeLists.txt 7Index: cpprest/Release/CMakeLists.txt
8+++ cpprest-2.10.2/CMakeLists.txt 8===================================================================
9@@ -18,7 +18,7 @@ enable_testing() 9--- cpprest.orig/Release/CMakeLists.txt
10+++ cpprest/Release/CMakeLists.txt
11@@ -18,7 +18,6 @@
10 set(WERROR ON CACHE BOOL "Treat Warnings as Errors.") 12 set(WERROR ON CACHE BOOL "Treat Warnings as Errors.")
11 set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.") 13 set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.")
12 set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.") 14 set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.")
13-set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.") 15-set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.")
14+set(CPPREST_EXPORT_DIR lib/cmake/cpprestsdk CACHE STRING "Directory to install CMake config files.")
15 set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.") 16 set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.")
16 set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.") 17 set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.")
17 18
19@@ -63,6 +62,9 @@
20 include(cmake/cpprest_find_openssl.cmake)
21 include(cmake/cpprest_find_websocketpp.cmake)
22 include(CheckIncludeFiles)
23+if(UNIX)
24+include(GNUInstallDirs)
25+endif(UNIX)
26
27 find_package(Threads REQUIRED)
28 if(THREADS_HAVE_PTHREAD_ARG)
29Index: cpprest/Release/src/CMakeLists.txt
30===================================================================
31--- cpprest.orig/Release/src/CMakeLists.txt
32+++ cpprest/Release/src/CMakeLists.txt
33@@ -250,21 +250,21 @@
34 install(
35 TARGETS ${CPPREST_TARGETS}
36 EXPORT cpprestsdk-targets
37- RUNTIME DESTINATION bin
38- LIBRARY DESTINATION lib
39- ARCHIVE DESTINATION lib
40+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
41+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
42+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
43 )
44
45 configure_file(../cmake/cpprestsdk-config.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" @ONLY)
46
47 install(
48 FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake"
49- DESTINATION ${CPPREST_EXPORT_DIR}
50+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
51 )
52 install(
53 EXPORT cpprestsdk-targets
54 FILE cpprestsdk-targets.cmake
55 NAMESPACE cpprestsdk::
56- DESTINATION ${CPPREST_EXPORT_DIR}
57+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
58 )
59 endif()