Start trying to ifdef cpprestsdk out (#10)

Author: BrennanConroy

.azure/default-build.yml

@@ -27,7 +27,7 @@ jobs:
 
   - task: CMake@1
     inputs:
-      cmakeArgs: .. ${{ parameters.cMakeRunArgs }} -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=${{ parameters.configuration }}
+      cmakeArgs: .. ${{ parameters.cMakeRunArgs }} -DCMAKE_TOOLCHAIN_FILE=../submodules/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=${{ parameters.configuration }} -DUSE_CPPRESTSDK=true
       workingDirectory: 'build.${{ parameters.configuration }}'
     displayName: Create build files
   - task: CMake@1

CMakeLists.txt

@@ -14,11 +14,17 @@ else()
   set(EXTRA_FLAGS "-DSIGNALRCLIENT_EXPORTS")
 endif()
 
+if(USE_CPPRESTSDK)
+  string(APPEND EXTRA_FLAGS " -DUSE_CPPRESTSDK")
+endif()
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_LDFLAGS}")
 
-find_package(cpprestsdk REQUIRED)
-set(CPPREST_LIB "cpprestsdk::cpprest")
+if(USE_CPPRESTSDK)
+  find_package(cpprestsdk REQUIRED)
+  set(CPPREST_LIB "cpprestsdk::cpprest")
+endif()
 
 include_directories (include)
 

CMakeSettings.json

@@ -7,7 +7,7 @@
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_SAMPLES=true",
+      "cmakeCommandArgs": "-DBUILD_SAMPLES=true -DUSE_CPPRESTSDK=true",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
       "cmakeToolchain": "${projectDir}\\submodules\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake",
@@ -19,7 +19,7 @@
       "configurationType": "Release",
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
-      "cmakeCommandArgs": "-DBUILD_SAMPLES=true",
+      "cmakeCommandArgs": "-DBUILD_SAMPLES=true -DUSE_CPPRESTSDK=true",
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
       "cmakeToolchain": "${projectDir}\\submodules\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake",

azure-pipelines.yml

@@ -14,7 +14,10 @@ jobs:
   parameters:
     agentOs: macOs
     beforeBuild:
-    - script: brew install gcc6
+    # XCode 11 doesn't play nicely with gcc workaround by using XCode 10. We can try updating to a newer XCode in the future
+    # Once the problem has been resolved
+    - script: sudo xcode-select --switch /Applications/Xcode_10.3.app
+    - script: brew install gcc
     - bash: "./submodules/vcpkg/bootstrap-vcpkg.sh"
       displayName: Bootstrap vcpkg
     - bash: "./submodules/vcpkg/vcpkg install cpprestsdk"
@@ -25,4 +28,4 @@ jobs:
     agentOs: Linux
     beforeBuild:
     - script: sudo vcpkg install cpprestsdk boost-system boost-chrono boost-thread --vcpkg-root ./submodules/vcpkg
-      displayName: vcpkg install dependencies
+      displayName: vcpkg install dependencies

include/signalrclient/signalr_client_config.h

@@ -3,14 +3,18 @@
 
 #pragma once
 
+#ifdef USE_CPPRESTSDK
 #include "cpprest/http_client.h"
 #include "cpprest/ws_client.h"
+#endif
+
 #include "_exports.h"
 
 namespace signalr
 {
     class signalr_client_config
     {
+#ifdef USE_CPPRESTSDK
     public:
         SIGNALRCLIENT_API void __cdecl set_proxy(const web::web_proxy &proxy);
         // Please note that setting credentials does not work in all cases.
@@ -32,5 +36,6 @@ namespace signalr
         web::http::client::http_client_config m_http_client_config;
         web::websockets::client::websocket_client_config m_websocket_client_config;
         web::http::http_headers m_http_headers;
+#endif
     };
 }

src/signalrclient/CMakeLists.txt

@@ -19,21 +19,25 @@ set (SOURCES
 
 add_library (signalrclient SHARED ${SOURCES})
 
-if(APPLE)
-  target_link_libraries(signalrclient
-    PUBLIC ${CPPREST_LIB}
-    PRIVATE OpenSSL::SSL Boost::boost Boost::system Boost::chrono Boost::thread
-  )
-elseif(NOT WIN32)
-  target_link_libraries(signalrclient
-    PUBLIC ${CPPREST_LIB}
-    PRIVATE OpenSSL::SSL
-  )
+if(NOT USE_CPPRESTSDK)
+  target_link_libraries(signalrclient)
 else()
-  target_link_libraries(signalrclient
-    PUBLIC ${CPPREST_LIB}
-  )
-endif()
+  if(APPLE)
+    target_link_libraries(signalrclient
+      PUBLIC ${CPPREST_LIB}
+      PRIVATE OpenSSL::SSL Boost::boost Boost::system Boost::chrono Boost::thread
+    )
+  elseif(NOT WIN32)
+    target_link_libraries(signalrclient
+      PUBLIC ${CPPREST_LIB}
+      PRIVATE OpenSSL::SSL
+    )
+  else()
+    target_link_libraries(signalrclient
+      PUBLIC ${CPPREST_LIB}
+    )
+  endif()
+endif() # USE_CPPRESTSDK
 
 include(GNUInstallDirs)
 

src/signalrclient/connection_impl.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <mutex>
+#include <atomic>
 #include "signalrclient/http_client.h"
 #include "signalrclient/trace_level.h"
 #include "signalrclient/connection_state.h"

src/signalrclient/default_http_client.cpp

@@ -2,8 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 #include "stdafx.h"
+
+#ifdef USE_CPPRESTSDK
 #include "default_http_client.h"
 #include <thread>
+#include "cpprest/http_client.h"
 
 namespace signalr
 {
@@ -72,3 +75,4 @@ namespace signalr
         });
     }
 }
+#endif

src/signalrclient/default_http_client.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include "signalrclient/http_client.h"
-#include "cpprest/http_client.h"
 
 namespace signalr
 {

src/signalrclient/default_websocket_client.cpp

@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 #include "stdafx.h"
+
+#ifdef USE_CPPRESTSDK
 #include "default_websocket_client.h"
 
 namespace signalr
@@ -91,3 +93,4 @@ namespace signalr
             });
     }
 }
+#endif