diff options
| author |   Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2018-07-23 18:47:54 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-07-26 20:10:07 -0700 |
| commit | cff57daf6507f4b449e62678606d4988555dc6aa (patch) | |
| tree | c30229a6ed037a1e7a166a846e6408d806e9f08a /meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch | |
| parent | 4ad49edc90f4ff73a19accda4f12ef33b46effd1 (diff) | |
| download | meta-openembedded-contrib-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.patch | 50 |
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 Forwarded: https://github.com/Microsoft/cpprestsdk/pull/737 Last-Update: 2018-04-19 ---- cpprest-2.10.2.orig/CMakeLists.txt -+++ cpprest-2.10.2/CMakeLists.txt -@@ -18,7 +18,7 @@ enable_testing() +Index: cpprest/Release/CMakeLists.txt +=================================================================== +--- cpprest.orig/Release/CMakeLists.txt ++++ cpprest/Release/CMakeLists.txt +@@ -18,7 +18,6 @@ set(WERROR ON CACHE BOOL "Treat Warnings as Errors.") set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.") set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.") -set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.") -+set(CPPREST_EXPORT_DIR lib/cmake/cpprestsdk CACHE STRING "Directory to install CMake config files.") set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.") set(CPPREST_INSTALL ON CACHE BOOL "Add install commands.") +@@ -63,6 +62,9 @@ + include(cmake/cpprest_find_openssl.cmake) + include(cmake/cpprest_find_websocketpp.cmake) + include(CheckIncludeFiles) ++if(UNIX) ++include(GNUInstallDirs) ++endif(UNIX) + + find_package(Threads REQUIRED) + if(THREADS_HAVE_PTHREAD_ARG) +Index: cpprest/Release/src/CMakeLists.txt +=================================================================== +--- cpprest.orig/Release/src/CMakeLists.txt ++++ cpprest/Release/src/CMakeLists.txt +@@ -250,21 +250,21 @@ + install( + TARGETS ${CPPREST_TARGETS} + EXPORT cpprestsdk-targets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + + configure_file(../cmake/cpprestsdk-config.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" @ONLY) + + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" +- DESTINATION ${CPPREST_EXPORT_DIR} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + ) + install( + EXPORT cpprestsdk-targets + FILE cpprestsdk-targets.cmake + NAMESPACE cpprestsdk:: +- DESTINATION ${CPPREST_EXPORT_DIR} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + ) + endif() |