t-head/meta-openembedded
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-openembedded synced 2026-09-04 05:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

cpprest: update to new 2.10.3 release, simplify recipe now that it has a cmake file in the root location

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Gianfranco Costamagna
2018-08-06 10:29:17 +02:00
committed by Khem Raj
parent 19b47730e0
commit 47d2bfaff1
10 changed files with 23 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
meta-oe/recipes-support/cpprest/cpprest-2.10.3/fix-cmake-install.patch Normal file
View File

@@ -0,0 +1,59 @@
Description: install cmake files into /usr/lib/cmake/cpprestsdk
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Upstream-Status: https://github.com/Microsoft/cpprestsdk/pull/737
Forwarded: https://github.com/Microsoft/cpprestsdk/pull/737
Last-Update: 2018-04-19
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_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
@@ -253,21 +253,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()