From 14878705cc997c0002b9d0cfda58cf592c790a95 Mon Sep 17 00:00:00 2001 From: Travis Hunter Date: Wed, 3 May 2023 08:50:19 -0600 Subject: [PATCH] Changing https to http in ThrustCurveAPI to work around issue in Windows where curl isn't being built with SSL support --- CMakeLists.txt | 25 +++++++++++++++++++------ utils/ThrustCurveAPI.cpp | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 828a0a2..a0659ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,6 @@ cmake_minimum_required(VERSION 3.16) project(qtrocket VERSION 0.1 LANGUAGES CXX) -set(CMAKE_AUTOUIC ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) - -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED ON) include(FetchContent) @@ -21,14 +15,33 @@ FetchContent_MakeAvailable(fmt) FetchContent_Declare(jsoncpp GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp GIT_TAG 1.9.5) +set(JSONCPP_WITH_TESTS OFF) +set(JSONCPP_WITH_EXAMPLE OFF) +set(JSONCPP_WITH_PKGCONFIG_SUPPORT OFF) +set(JSONCPP_BUILD_SHARED_LIBS OFF) +set(JSONCPP_BUILD_OBJECT_LIBS OFF) +set(JSONCPP_BUILD_STATIC_LIBS ON) FetchContent_MakeAvailable(jsoncpp) # curl dependency FetchContent_Declare(CURL GIT_REPOSITORY https://github.com/curl/curl GIT_TAG curl-8_0_1) +set(BUILD_CURL_EXE OFF) +set(BUILD_SHARED_LIBS OFF) +set(HTTP_ONLY ON) +set(SSL_ENABLED ON) FetchContent_MakeAvailable(CURL) + + +set(CMAKE_AUTOUIC ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + if(WIN32) set(CMAKE_PREFIX_PATH $ENV{QTDIR}) include_directories("C:\\boost\\boost_1_82_0\\") diff --git a/utils/ThrustCurveAPI.cpp b/utils/ThrustCurveAPI.cpp index de3ff83..26ad054 100644 --- a/utils/ThrustCurveAPI.cpp +++ b/utils/ThrustCurveAPI.cpp @@ -14,7 +14,7 @@ namespace utils { ThrustCurveAPI::ThrustCurveAPI() - : hostname("https://www.thrustcurve.org/"), + : hostname("http://www.thrustcurve.org/"), curlConnection() {