From e9d5fd82ef81f4591427fc256f98dc12118f2b9f Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 8 Oct 2023 15:38:17 +0200 Subject: [PATCH 1/3] cmake/3.x.x: bump OpenSSL --- recipes/cmake/3.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/cmake/3.x.x/conanfile.py b/recipes/cmake/3.x.x/conanfile.py index f6de583315097..f72bbcd292b1f 100644 --- a/recipes/cmake/3.x.x/conanfile.py +++ b/recipes/cmake/3.x.x/conanfile.py @@ -38,7 +38,7 @@ def config_options(self): def requirements(self): if self.options.with_openssl: - self.requires("openssl/1.1.1t") + self.requires("openssl/1.1.1w") def validate_build(self): if self.settings.os == "Windows" and self.options.bootstrap: From 850a672844e0d2f55310e38a9ee35b5951ee10cf Mon Sep 17 00:00:00 2001 From: mayeut Date: Sun, 8 Oct 2023 22:24:45 +0200 Subject: [PATCH 2/3] with_openssl option is only used on Linux --- recipes/cmake/3.x.x/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/cmake/3.x.x/conanfile.py b/recipes/cmake/3.x.x/conanfile.py index f72bbcd292b1f..7006b38fbf056 100644 --- a/recipes/cmake/3.x.x/conanfile.py +++ b/recipes/cmake/3.x.x/conanfile.py @@ -33,11 +33,11 @@ class CMakeConan(ConanFile): } def config_options(self): - if self.settings.os == "Windows": - self.options.with_openssl = False + if self.settings.os != "Linux": + del self.options.with_openssl def requirements(self): - if self.options.with_openssl: + if self.options.get_safe("with_openssl", default=False): self.requires("openssl/1.1.1w") def validate_build(self): From 88250c236b7078474c49dca845745567fab32f98 Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:46:20 +0100 Subject: [PATCH 3/3] cmake/3.x.x: use version range for OpenSSL --- recipes/cmake/3.x.x/conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/cmake/3.x.x/conanfile.py b/recipes/cmake/3.x.x/conanfile.py index 7006b38fbf056..042191e304bd0 100644 --- a/recipes/cmake/3.x.x/conanfile.py +++ b/recipes/cmake/3.x.x/conanfile.py @@ -33,12 +33,12 @@ class CMakeConan(ConanFile): } def config_options(self): - if self.settings.os != "Linux": - del self.options.with_openssl + if self.settings.os == "Windows": + self.options.with_openssl = False def requirements(self): if self.options.get_safe("with_openssl", default=False): - self.requires("openssl/1.1.1w") + self.requires("openssl/[>=1.1 <4]") def validate_build(self): if self.settings.os == "Windows" and self.options.bootstrap: