summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
authorGravatar bunnei2017-09-11 16:16:11 -0400
committerGravatar GitHub2017-09-11 16:16:11 -0400
commit3e2e9be6d542042fbf0548e94f34c5274bf2f714 (patch)
tree8f24b1769d89860390adeff8f9b390cdc4d725b1 /externals
parentMerge pull request #2923 from B3n30/system_curl_osx (diff)
parentBuild: Enable SSL in mingw by linking against WinSSL (diff)
downloadyuzu-3e2e9be6d542042fbf0548e94f34c5274bf2f714.tar.gz
yuzu-3e2e9be6d542042fbf0548e94f34c5274bf2f714.tar.xz
yuzu-3e2e9be6d542042fbf0548e94f34c5274bf2f714.zip
Merge pull request #2922 from jroweboy/mingw-telemetry
Build: Enable SSL in mingw by linking against WinSSL
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt19
1 files changed, 17 insertions, 2 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 8e4bcf21f..4a4ba1101 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,5 +1,8 @@
1# Definitions for all external bundled libraries 1# Definitions for all external bundled libraries
2 2
3set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
4include(DownloadExternals)
5
3# Catch 6# Catch
4add_library(catch-single-include INTERFACE) 7add_library(catch-single-include INTERFACE)
5target_include_directories(catch-single-include INTERFACE catch/single_include) 8target_include_directories(catch-single-include INTERFACE catch/single_include)
@@ -54,9 +57,21 @@ add_subdirectory(enet)
54target_include_directories(enet INTERFACE ./enet/include) 57target_include_directories(enet INTERFACE ./enet/include)
55 58
56if (ENABLE_WEB_SERVICE) 59if (ENABLE_WEB_SERVICE)
60 # msys installed curl is configured to use openssl, but that isn't portable
61 # since it relies on having the bundled certs install in the home folder for SSL
62 # by default on mingw, download the precompiled curl thats linked against windows native ssl
63 if (MINGW AND CITRA_USE_BUNDLED_CURL)
64 download_bundled_external("curl/" "curl-7_55_1" CURL_PREFIX)
65 set(CURL_PREFIX "${CMAKE_BINARY_DIR}/externals/curl-7_55_1")
66 set(CURL_FOUND YES)
67 set(CURL_INCLUDE_DIR "${CURL_PREFIX}/include" CACHE PATH "Path to curl headers")
68 set(CURL_LIBRARY "${CURL_PREFIX}/lib/libcurldll.a" CACHE PATH "Path to curl library")
69 set(CURL_DLL_DIR "${CURL_PREFIX}/lib/" CACHE PATH "Path to curl.dll")
70 set(USE_SYSTEM_CURL ON CACHE BOOL "")
71 endif()
57 # CPR 72 # CPR
58 option(BUILD_TESTING OFF) 73 set(BUILD_TESTING OFF CACHE BOOL "")
59 option(BUILD_CPR_TESTS OFF) 74 set(BUILD_CPR_TESTS OFF CACHE BOOL "")
60 add_subdirectory(cpr) 75 add_subdirectory(cpr)
61 target_include_directories(cpr INTERFACE ./cpr/include) 76 target_include_directories(cpr INTERFACE ./cpr/include)
62 77