mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
chore: Use OpenSSL 3 by default in conan (#5159)
This commit is contained in:
parent
137cd7a46b
commit
f34a371576
|
@ -77,19 +77,6 @@ Note: This installation will take about 2.1 GB of disk space.
|
||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>OpenSSL</summary>
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
</details>
|
|
||||||
|
|
||||||
## Building
|
## Building
|
||||||
|
|
||||||
### Using CMake
|
### Using CMake
|
||||||
|
|
|
@ -117,6 +117,7 @@
|
||||||
- Dev: Added Tests for Windows and MacOS in CI. (#4970, #5032)
|
- 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: Added "Copy message as JSON" option when shift-right-clicking a message. (#5150)
|
||||||
- Dev: Windows now builds with Qt6 by default. (#5155)
|
- 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: Move `clang-tidy` checker to its own CI job. (#4996)
|
||||||
- Dev: Refactored the Image Uploader feature. (#4971)
|
- Dev: Refactored the Image Uploader feature. (#4971)
|
||||||
- Dev: Refactored the SplitOverlay code. (#5082)
|
- Dev: Refactored the SplitOverlay code. (#5082)
|
||||||
|
|
|
@ -9,7 +9,7 @@ class Chatterino(ConanFile):
|
||||||
settings = "os", "compiler", "build_type", "arch"
|
settings = "os", "compiler", "build_type", "arch"
|
||||||
default_options = {
|
default_options = {
|
||||||
"with_benchmark": False,
|
"with_benchmark": False,
|
||||||
"with_openssl3": False,
|
"with_openssl3": True,
|
||||||
"openssl*:shared": True,
|
"openssl*:shared": True,
|
||||||
"boost*:header_only": True,
|
"boost*:header_only": True,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue