Attachment 1456798 Details for Bug 1589284 – Updated patch to fix libdir in cmake files

[patch] Updated patch to fix libdir in cmake files

cpprest-2.10.2-fix-libdir.patch (text/plain), 1.28 KB, created by c72578 on 2018-07-05 16:08:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: c72578

Created: 2018-07-05 16:08:19 UTC

Size: 1.28 KB

patch

obsolete

>diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
>index 3e0871c9..6a505ec3 100644
>--- a/Release/CMakeLists.txt
>+++ b/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}/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.")
> 
>diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
>index a37a8cff..cd90796a 100644
>--- a/Release/src/CMakeLists.txt
>+++ b/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