blob: 748e4da1a61370d89953d5fc6d84c520c5baa0f3 [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From ac61124df17ab76527508bbb9a3115d4d6cc1af6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 21 Nov 2016 11:26:26 -0800
4Subject: [PATCH] cmake: replace hardcoded lib/${CMAKE_LIBRARY_PATH} with
5 {CMAKE_INSTALL_LIBDIR}
6
7Fixes
8| CMake Error at src/jsonrpccpp/CMakeLists.txt:207 (install):
9| install TARGETS given unknown argument "/lib".
10
11and
12
13Wrong install paths during cross compile
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/jsonrpccpp/CMakeLists.txt | 8 ++++----
18 src/stubgenerator/CMakeLists.txt | 6 +++---
19 2 files changed, 7 insertions(+), 7 deletions(-)
20
21diff --git a/src/jsonrpccpp/CMakeLists.txt b/src/jsonrpccpp/CMakeLists.txt
22index e4a1eb5..13f9056 100644
23--- a/src/jsonrpccpp/CMakeLists.txt
24+++ b/src/jsonrpccpp/CMakeLists.txt
25@@ -205,15 +205,15 @@ if (WIN32)
26 endif()
27
28 install(TARGETS ${ALL_LIBS}
29- LIBRARY DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH}
30- ARCHIVE DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH}
31+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
32+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
33 RUNTIME DESTINATION bin
34 )
35
36 #set pkg-config
37 get_filename_component(FULL_PATH_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ABSOLUTE)
38 set(FULL_PATH_INCLUDEDIR "${FULL_PATH_INSTALL_PREFIX}/include")
39-set(FULL_PATH_LIBDIR "${FULL_PATH_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_PATH}")
40+set(FULL_PATH_LIBDIR "${FULL_PATH_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
41
42 CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/libjsonrpccpp-client.pc.cmake ${CMAKE_BINARY_DIR}/libjsonrpccpp-client.pc)
43 CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/libjsonrpccpp-server.pc.cmake ${CMAKE_BINARY_DIR}/libjsonrpccpp-server.pc)
44@@ -223,6 +223,6 @@ INSTALL(FILES
45 "${CMAKE_BINARY_DIR}/libjsonrpccpp-server.pc"
46 "${CMAKE_BINARY_DIR}/libjsonrpccpp-client.pc"
47 "${CMAKE_BINARY_DIR}/libjsonrpccpp-common.pc"
48- DESTINATION "lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH}/pkgconfig")
49+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
50
51
52diff --git a/src/stubgenerator/CMakeLists.txt b/src/stubgenerator/CMakeLists.txt
53index f9dbe4c..b57b0fe 100644
54--- a/src/stubgenerator/CMakeLists.txt
55+++ b/src/stubgenerator/CMakeLists.txt
56@@ -58,15 +58,15 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/libjsonrpccpp-stub.pc.cmake ${CMAKE_BIN
57
58 INSTALL(FILES
59 "${CMAKE_BINARY_DIR}/libjsonrpccpp-stub.pc"
60- DESTINATION "lib/${CMAKE_LIBRARY_PATH}/pkgconfig")
61+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
62
63 install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/stubgenerator/
64 DESTINATION include/jsonrpccpp/stubgen
65 FILES_MATCHING PATTERN "*.h")
66
67 install(TARGETS ${ALL_LIBS} jsonrpcstub
68- LIBRARY DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH}
69- ARCHIVE DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_PATH}
70+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
71+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
72 RUNTIME DESTINATION bin
73 )
74
75--
762.10.2
77