blob: ab922768048667d9f082170ff2177fb509526dca (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
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
@@ -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()
|
