From f34a371576c550a0eb2eead49f33fa2ab4d845d7 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 10 Feb 2024 11:40:58 +0100 Subject: [PATCH] chore: Use OpenSSL 3 by default in conan (#5159) --- BUILDING_ON_WINDOWS.md | 13 ------------- CHANGELOG.md | 1 + conanfile.py | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/BUILDING_ON_WINDOWS.md b/BUILDING_ON_WINDOWS.md index 1ddbfbd54..dc66d65c4 100644 --- a/BUILDING_ON_WINDOWS.md +++ b/BUILDING_ON_WINDOWS.md @@ -77,19 +77,6 @@ Note: This installation will take about 2.1 GB of disk space. -
-OpenSSL - -For our websocket library, we need OpenSSL 1.1. - -1. Download OpenSSL for windows, version `1.1.1s`: **[Download](https://web.archive.org/web/20221101204129/https://slproweb.com/download/Win64OpenSSL-1_1_1s.exe)** -2. When prompted, install OpenSSL to `C:\local\openssl` -3. When prompted, copy the OpenSSL DLLs to "The OpenSSL binaries (/bin) directory". - -Note: This installation will take about 200 MB of disk space. - -
- ## Building ### Using CMake diff --git a/CHANGELOG.md b/CHANGELOG.md index 82851cf34..901657056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -117,6 +117,7 @@ - Dev: Added Tests for Windows and MacOS in CI. (#4970, #5032) - Dev: Added "Copy message as JSON" option when shift-right-clicking a message. (#5150) - Dev: Windows now builds with Qt6 by default. (#5155) +- Dev: Conan now uses OpenSSL 3 by default. (#5159) - Dev: Move `clang-tidy` checker to its own CI job. (#4996) - Dev: Refactored the Image Uploader feature. (#4971) - Dev: Refactored the SplitOverlay code. (#5082) diff --git a/conanfile.py b/conanfile.py index 45955432e..a1d498695 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ class Chatterino(ConanFile): settings = "os", "compiler", "build_type", "arch" default_options = { "with_benchmark": False, - "with_openssl3": False, + "with_openssl3": True, "openssl*:shared": True, "boost*:header_only": True, }