Attachment 1456297 Details for Bug 1589284 – Patch to fix libdir in cmake files

[patch] Patch to fix libdir in cmake files

cpprest-2.10.2-fix-libdir.patch (text/plain), 2.49 KB, created by Dmitry Mikhirev on 2018-07-03 17:36:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Mikhirev

Created: 2018-07-03 17:36:48 UTC

Size: 2.49 KB

patch

obsolete

>Index: cpprestsdk-2.10.2/Release/CMakeLists.txt
>===================================================================
>--- cpprestsdk-2.10.2.orig/Release/CMakeLists.txt
>+++ cpprestsdk-2.10.2/Release/CMakeLists.txt
>@@ -18,7 +18,7 @@ enable_testing()
> 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${LIB_SUFFIX}/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.")
> 
>Index: cpprestsdk-2.10.2/Release/libs/websocketpp/CMakeLists.txt
>===================================================================
>--- cpprestsdk-2.10.2.orig/Release/libs/websocketpp/CMakeLists.txt
>+++ cpprestsdk-2.10.2/Release/libs/websocketpp/CMakeLists.txt
>@@ -17,7 +17,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
> if (WIN32 AND NOT CYGWIN)
>   set (DEF_INSTALL_CMAKE_DIR cmake)
> else ()
>-  set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
>+  set (DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/websocketpp)
> endif ()
> set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
> 
>@@ -48,7 +48,7 @@ set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SO
> set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
> set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
> set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
>-set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
>+set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib${LIB_SUFFIX})
> 
> # CMake install step prefix. I assume linux users want the prefix to
> # be the default /usr or /usr/local so this is only adjusted on Windows.
>Index: cpprestsdk-2.10.2/Release/src/CMakeLists.txt
>===================================================================
>--- cpprestsdk-2.10.2.orig/Release/src/CMakeLists.txt
>+++ cpprestsdk-2.10.2/Release/src/CMakeLists.txt
>@@ -251,8 +251,8 @@ if(CPPREST_INSTALL)
>     TARGETS ${CPPREST_TARGETS}
>     EXPORT cpprestsdk-targets
>     RUNTIME DESTINATION bin
>-    LIBRARY DESTINATION lib
>-    ARCHIVE DESTINATION lib
>+    LIBRARY DESTINATION lib${LIB_SUFFIX}
>+    ARCHIVE DESTINATION lib${LIB_SUFFIX}
>   )
> 
>   configure_file(../cmake/cpprestsdk-config.in.cmake "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake" @ONLY)

Actions: View | Diff

Attachments on bug 1589284: 1456297 | 1456798