Merge remote-tracking branch 'origin/master' into compress

Author: epistor

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
 project(cpprestsdk-root NONE)
 
 add_subdirectory(Release)

README.md

@@ -47,7 +47,7 @@ target_link_libraries(main PRIVATE cpprestsdk::cpprest)
 *   Features - HTTP client/server, JSON, URI, asynchronous streams, WebSockets client, oAuth
 *   PPL Tasks - A powerful model for composing asynchronous operations based on C++ 11 features
 *   Platforms - Windows desktop, Windows Store (UWP), Linux, OS X, Unix, iOS, and Android
-*   Support for Visual Studio 2015 and 2017 with debugger visualizers
+*   Support for [Visual Studio 2015 and 2017](https://visualstudio.microsoft.com/) with debugger visualizers
 
 ## Contribute Back!
 

Release/CMakeLists.txt

@@ -19,7 +19,7 @@ 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_EXCLUDE_BROTLI ON CACHE BOOL "Exclude Brotli compression functionality.")
-set(CPPREST_EXPORT_DIR lib/cpprestsdk CACHE STRING "Directory to install CMake config files.")
+set(CPPREST_EXPORT_DIR 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.")
 

Release/src/CMakeLists.txt

@@ -277,12 +277,12 @@ if(CPPREST_INSTALL)
 
   install(
     FILES "${CMAKE_CURRENT_BINARY_DIR}/cpprestsdk-config.cmake"
-    DESTINATION ${CPPREST_EXPORT_DIR}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPPREST_EXPORT_DIR}
   )
   install(
     EXPORT cpprestsdk-targets
     FILE cpprestsdk-targets.cmake
     NAMESPACE cpprestsdk::
-    DESTINATION ${CPPREST_EXPORT_DIR}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPPREST_EXPORT_DIR}
   )
 endif()