Merge branch 'master' into HEAD

Author: ras0219-msft

Release/CMakeLists.txt

@@ -1,18 +1,22 @@
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
 if(POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW) # use MACOSX_RPATH
 endif()
-project(cpprest)
+if(UNIX)
+  project(cpprest C CXX)
+else()
+  project(cpprest CXX)
+endif()
 
 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/cpprest CACHE STRING "Directory to install CMake config files.")
-set(CPPREST_EXPORT_NAME cpprest-config CACHE STRING "Name for CMake config file.")
+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.")
 
 if(IOS OR ANDROID)
   set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
@@ -172,35 +176,35 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(Casablanca_SYSTEM_INCLUDE_DIRS)
 set(Casablanca_LIBRARY cpprest)
 set(Casablanca_LIBRARIES cpprest)
 get_directory_property(PARENT_DIR PARENT_DIRECTORY)
 if(NOT PARENT_DIR STREQUAL "")
   set(Casablanca_LIBRARIES ${Casablanca_LIBRARIES} PARENT_SCOPE)
 endif()
 
-# Everything in the project needs access to the casablanca include directories
-include_directories(       ${Casablanca_INCLUDE_DIRS})
-include_directories(SYSTEM ${Casablanca_SYSTEM_INCLUDE_DIRS})
-
 # Finally, the tests all use the same style declaration to build themselves, so we use a function
 function(add_casablanca_test NAME SOURCES_VAR)
   add_library(${NAME} ${TEST_LIBRARY_TARGET_TYPE} ${${SOURCES_VAR}})
   message("-- Added test library ${NAME}")
-  if (NOT TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
+  if(TEST_LIBRARY_TARGET_TYPE STREQUAL "OBJECT")
+    foreach(_dep httptest_utilities common_utilities unittestpp cpprest)
+      target_include_directories(${NAME} PRIVATE $<TARGET_PROPERTY:${_dep},INTERFACE_INCLUDE_DIRECTORIES>)
+      target_compile_definitions(${NAME} PRIVATE $<TARGET_PROPERTY:${_dep},INTERFACE_COMPILE_DEFINITIONS>)
+    endforeach()
+  else()
     target_link_libraries(${NAME}
       httptest_utilities
       common_utilities
       unittestpp
       cpprest
       ${ANDROID_STL_FLAGS}
-      )
+    )
     if (BUILD_SHARED_LIBS)
       add_test(NAME ${NAME}
         WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         COMMAND test_runner $<TARGET_FILE_NAME:${NAME}>
-        )
+      )
     endif()
   endif()
 endfunction()

Release/cmake/cpprest_find_boost.cmake

@@ -1,13 +1,12 @@
 function(cpprest_find_boost)
-  if(Boost_FOUND)
+  if(TARGET cpprestsdk_boost_internal)
     return()
   endif()
 
   if(IOS)
     set(IOS_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../Build_iOS")
-    set(Boost_FOUND 1 CACHE INTERNAL "")
-    set(Boost_FRAMEWORK "-F ${IOS_SOURCE_DIR} -framework boost" CACHE INTERNAL "")
-    set(Boost_INCLUDE_DIR "$<BUILD_INTERFACE:${IOS_SOURCE_DIR}/boost.framework/Headers>" CACHE INTERNAL "")
+    set(Boost_LIBRARIES "${IOS_SOURCE_DIR}/boost.framework/boost" CACHE INTERNAL "")
+    set(Boost_INCLUDE_DIR "${IOS_SOURCE_DIR}/boost.framework/Headers" CACHE INTERNAL "")
   elseif(ANDROID)
     set(Boost_COMPILER "-clang")
     if(ARM)
@@ -24,17 +23,40 @@ function(cpprest_find_boost)
     find_package(Boost REQUIRED COMPONENTS system date_time regex)
   endif()
 
-  set(Boost_FOUND 1 CACHE INTERNAL "")
-  set(Boost_INCLUDE_DIR ${Boost_INCLUDE_DIR} CACHE INTERNAL "")
-  set(Boost_LIBRARIES
-    ${Boost_SYSTEM_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_ATOMIC_LIBRARY}
-    ${Boost_CHRONO_LIBRARY}
-    ${Boost_RANDOM_LIBRARY}
-    ${Boost_REGEX_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY}
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${BOOST_FRAMEWORK}
-    CACHE INTERNAL "")
- endfunction()
+  add_library(cpprestsdk_boost_internal INTERFACE)
+  if(NOT TARGET Boost::boost)
+    target_include_directories(cpprestsdk_boost_internal INTERFACE "$<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>")
+    target_link_libraries(cpprestsdk_boost_internal INTERFACE "$<BUILD_INTERFACE:${Boost_LIBRARIES}>")
+  else()
+    if(ANDROID)
+      target_link_libraries(cpprestsdk_boost_internal INTERFACE
+        Boost::boost
+        Boost::random
+        Boost::system
+        Boost::thread
+        Boost::filesystem
+        Boost::chrono
+        Boost::atomic
+      )
+    elseif(UNIX)
+      target_link_libraries(cpprestsdk_boost_internal INTERFACE
+        Boost::boost
+        Boost::random
+        Boost::system
+        Boost::thread
+        Boost::filesystem
+        Boost::chrono
+        Boost::atomic
+        Boost::date_time
+        Boost::regex
+      )
+    else()
+      target_link_libraries(cpprestsdk_boost_internal INTERFACE
+        Boost::boost
+        Boost::system
+        Boost::date_time
+        Boost::regex
+      )
+    endif()
+  endif()
+endfunction()

Release/cmake/cpprest_find_openssl.cmake

@@ -1,62 +1,70 @@
 function(cpprest_find_openssl)
-  if(OPENSSL_FOUND)
+  if(TARGET cpprestsdk_openssl_internal)
     return()
   endif()
 
   if(IOS)
     set(IOS_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../Build_iOS")
-    set(OPENSSL_FOUND 1 CACHE INTERNAL "")
-    set(OPENSSL_INCLUDE_DIR "$<BUILD_INTERFACE:${IOS_SOURCE_DIR}/openssl/include>" CACHE INTERNAL "")
+
+    set(OPENSSL_INCLUDE_DIR "${IOS_SOURCE_DIR}/openssl/include" CACHE INTERNAL "")
     set(OPENSSL_LIBRARIES
       "${IOS_SOURCE_DIR}/openssl/lib/libcrypto.a"
       "${IOS_SOURCE_DIR}/openssl/lib/libssl.a"
       CACHE INTERNAL ""
       )
     set(_SSL_LEAK_SUPPRESS_AVAILABLE ON CACHE INTERNAL "")
-    return()
   elseif(ANDROID)
-    set(OPENSSL_FOUND 1 CACHE INTERNAL "")
     if(ARM)
-      set(OPENSSL_INCLUDE_DIR "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include>" CACHE INTERNAL "")
+      set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/include" CACHE INTERNAL "")
       set(OPENSSL_LIBRARIES
         "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libssl.a"
         "${CMAKE_BINARY_DIR}/../openssl/armeabi-v7a/lib/libcrypto.a"
         CACHE INTERNAL ""
         )
     else()
-      set(OPENSSL_INCLUDE_DIR "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/../openssl/x86/include>" CACHE INTERNAL "")
+      set(OPENSSL_INCLUDE_DIR "${CMAKE_BINARY_DIR}/../openssl/x86/include" CACHE INTERNAL "")
       set(OPENSSL_LIBRARIES
         "${CMAKE_BINARY_DIR}/../openssl/x86/lib/libssl.a"
         "${CMAKE_BINARY_DIR}/../openssl/x86/lib/libcrypto.a"
         CACHE INTERNAL ""
         )
     endif()
-  elseif(APPLE)
-    if(NOT DEFINED OPENSSL_ROOT_DIR)
-      # Prefer a homebrew version of OpenSSL over the one in /usr/lib
-      file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
-      # Prefer the latest (make the latest one first)
-      list(REVERSE OPENSSL_ROOT_DIR)
-    endif()
-    # This should prevent linking against the system provided 0.9.8y
-    set(_OPENSSL_VERSION "")
-    find_package(OpenSSL 1.0.0 REQUIRED)
+    set(_SSL_LEAK_SUPPRESS_AVAILABLE ON CACHE INTERNAL "")
   else()
+    if(APPLE)
+      if(NOT DEFINED OPENSSL_ROOT_DIR)
+        # Prefer a homebrew version of OpenSSL over the one in /usr/lib
+        file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)
+        # Prefer the latest (make the latest one first)
+        list(REVERSE OPENSSL_ROOT_DIR)
+      endif()
+      # This should prevent linking against the system provided 0.9.8y
+      set(_OPENSSL_VERSION "")
+    endif()
     find_package(OpenSSL 1.0.0 REQUIRED)
+
+    INCLUDE(CheckCXXSourceCompiles)
+    set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+    CHECK_CXX_SOURCE_COMPILES("
+      #include <openssl/ssl.h>
+      int main()
+      {
+      ::SSL_COMP_free_compression_methods();
+      }
+    " _SSL_LEAK_SUPPRESS_AVAILABLE)
   endif()
 
-  set(OPENSSL_FOUND 1 CACHE INTERNAL "")
-  set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR} CACHE INTERNAL "")
-  set(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} CACHE INTERNAL "")
+  add_library(cpprestsdk_openssl_internal INTERFACE)
+  if(TARGET OpenSSL::SSL)
+    target_link_libraries(cpprestsdk_openssl_internal INTERFACE OpenSSL::SSL)
+  else()
+    target_link_libraries(cpprestsdk_openssl_internal INTERFACE "$<BUILD_INTERFACE:${OPENSSL_LIBRARIES}>")
+    target_include_directories(cpprestsdk_openssl_internal INTERFACE "$<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>")
+  endif()
 
-  INCLUDE(CheckCXXSourceCompiles)
-  set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-  set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
-  CHECK_CXX_SOURCE_COMPILES("
-    #include <openssl/ssl.h>
-    int main()
-    {
-    ::SSL_COMP_free_compression_methods();
-    }
-  " _SSL_LEAK_SUPPRESS_AVAILABLE)
+  if (NOT _SSL_LEAK_SUPPRESS_AVAILABLE)
+    # libressl doesn't ship with the cleanup method being used in ws_client_wspp
+    target_compile_definitions(cpprestsdk_openssl_internal INTERFACE -DCPPREST_NO_SSL_LEAK_SUPPRESS)
+  endif()
 endfunction()

Release/cmake/cpprest_find_websocketpp.cmake

@@ -1,5 +1,5 @@
 function(cpprest_find_websocketpp)
-  if(WEBSOCKETPP_FOUND)
+  if(TARGET cpprestsdk_websocketpp_internal)
     return()
   endif()
 
@@ -9,7 +9,17 @@ function(cpprest_find_websocketpp)
     set(WEBSOCKETPP_INCLUDE_DIR ${WEBSOCKETPP_INCLUDE_DIR} CACHE INTERNAL "")
   else()
     message("-- websocketpp not found, using the embedded version")
-    set(WEBSOCKETPP_FOUND 1 CACHE INTERNAL "" FORCE)
     set(WEBSOCKETPP_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/libs/websocketpp CACHE INTERNAL "")
   endif()
+
+  cpprest_find_boost()
+  cpprest_find_openssl()
+
+  add_library(cpprestsdk_websocketpp_internal INTERFACE)
+  target_include_directories(cpprestsdk_websocketpp_internal INTERFACE "$<BUILD_INTERFACE:${WEBSOCKETPP_INCLUDE_DIR}>")
+  target_link_libraries(cpprestsdk_websocketpp_internal
+    INTERFACE
+      cpprestsdk_boost_internal
+      cpprestsdk_openssl_internal
+  )
 endfunction()

Release/cmake/cpprest_find_zlib.cmake

@@ -1,21 +1,25 @@
 function(cpprest_find_zlib)
-  if(ZLIB_FOUND)
+  if(TARGET cpprestsdk_zlib_internal)
     return()
   endif()
 
   if(APPLE AND NOT IOS)
     # Prefer the homebrew version of zlib
-    find_library(ZLIB_LIBRARIES NAMES libz.a PATHS /usr/local/Cellar/zlib/1.2.8/lib NO_DEFAULT_PATH)
+    find_library(ZLIB_LIBRARY NAMES libz.a PATHS /usr/local/Cellar/zlib/1.2.8/lib NO_DEFAULT_PATH)
     find_path(ZLIB_INCLUDE_DIRS NAMES zlib.h PATHS /usr/local/Cellar/zlib/1.2.8/include NO_DEFAULT_PATH)
 
-    if(NOT ZLIB_LIBRARIES OR NOT ZLIB_INCLUDE_DIRS)
+    if(NOT ZLIB_LIBRARY OR NOT ZLIB_INCLUDE_DIRS)
       find_package(ZLIB REQUIRED)
     endif()
   else()
     find_package(ZLIB REQUIRED)
   endif()
 
-  set(ZLIB_FOUND 1 CACHE INTERNAL "")
-  set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} CACHE INTERNAL "")
-  set(ZLIB_LIBRARIES ${ZLIB_LIBRARIES} CACHE INTERNAL "")
+  add_library(cpprestsdk_zlib_internal INTERFACE)
+  if(TARGET ZLIB::ZLIB)
+    target_link_libraries(cpprestsdk_zlib_internal INTERFACE ZLIB::ZLIB)
+  else()
+    target_link_libraries(cpprestsdk_zlib_internal INTERFACE "$<BUILD_INTERFACE:${ZLIB_LIBRARY}")
+    target_include_directories(cpprestsdk_zlib_internal INTERFACE "$<BUILD_INTERFACE:${ZLIB_INCLUDE_DIRS}")
+  endif()
 endfunction()

Release/cmake/cpprestsdk-config.in.cmake

@@ -0,0 +1,17 @@
+include(CMakeFindDependencyMacro)
+if(@CPPREST_USES_ZLIB@)
+  find_dependency(ZLIB)
+endif()
+
+if(@CPPREST_USES_OPENSSL@)
+  find_dependency(OpenSSL)
+endif()
+
+if(@CPPREST_USES_BOOST@)
+  if(UNIX)
+    find_dependency(Boost COMPONENTS random system thread filesystem chrono atomic date_time regex)
+  else()
+    find_dependency(Boost COMPONENTS system date_time regex)
+  endif()
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/cpprestsdk-targets.cmake")

Release/include/cpprest/http_client.h

@@ -87,7 +87,6 @@ class http_client_config
 #if !defined(__cplusplus_winrt)
         , m_validate_certificates(true)
 #endif
-        , m_set_user_nativehandle_options([](native_handle)->void{})
 #if !defined(_WIN32) && !defined(__cplusplus_winrt) || defined(CPPREST_FORCE_HTTP_CLIENT_ASIO)
         , m_tlsext_sni_enabled(true)
 #endif
@@ -312,6 +311,30 @@ class http_client_config
     }
 #endif
 
+    /// <summary>
+    /// Sets a callback to enable custom setting of platform specific options.
+    /// </summary>
+    /// <remarks>
+    /// The native_handle is the following type depending on the underlying platform:
+    ///     Windows Desktop, WinHTTP - HINTERNET (session)
+    /// </remarks>
+    /// <param name="callback">A user callback allowing for customization of the session</param>
+    void set_nativesessionhandle_options(const std::function<void(native_handle)> &callback)
+    {
+        m_set_user_nativesessionhandle_options = callback;
+    }
+
+    /// <summary>
+    /// Invokes a user's callback to allow for customization of the session.
+    /// </summary>
+    /// <remarks>Internal Use Only</remarks>
+    /// <param name="handle">A internal implementation handle.</param>
+    void _invoke_nativesessionhandle_options(native_handle handle) const
+    {
+        if (m_set_user_nativesessionhandle_options)
+            m_set_user_nativesessionhandle_options(handle);
+    }
+
     /// <summary>
     /// Sets a callback to enable custom setting of platform specific options.
     /// </summary>
@@ -335,7 +358,8 @@ class http_client_config
     /// <param name="handle">A internal implementation handle.</param>
     void invoke_nativehandle_options(native_handle handle) const
     {
-        m_set_user_nativehandle_options(handle);
+        if (m_set_user_nativehandle_options)
+            m_set_user_nativehandle_options(handle);
     }
 
 #if !defined(_WIN32) && !defined(__cplusplus_winrt) || defined(CPPREST_FORCE_HTTP_CLIENT_ASIO)
@@ -397,6 +421,7 @@ class http_client_config
 #endif
 
     std::function<void(native_handle)> m_set_user_nativehandle_options;
+	std::function<void(native_handle)> m_set_user_nativesessionhandle_options;
 
 #if !defined(_WIN32) && !defined(__cplusplus_winrt) || defined(CPPREST_FORCE_HTTP_CLIENT_ASIO)
     std::function<void(boost::asio::ssl::context&)> m_ssl_context_callback;