Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[poco] re-enabling support for NetSSL with OpenSSL on Windows #6314

Merged
merged 4 commits into from
Jul 19, 2021
Merged

[poco] re-enabling support for NetSSL with OpenSSL on Windows #6314

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b909a1
[poco] support NetSSL with OpenSSL on Windows #6311
jngrb Jul 13, 2021
61fc059
[poco] removed unnecessary default option
jngrb Jul 13, 2021
bf2de23
Merge branch 'conan-io:master' into master
jngrb Jul 16, 2021
1ba9584
[poco] default of enable_netSSL_win set to false
jngrb Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions recipes/poco/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ def source(self):
def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
del self.options.enable_netssl
del self.options.enable_fork
else:
del self.options.enable_netssl_win
Expand Down Expand Up @@ -141,6 +140,8 @@ def validate(self):
if self.options.enable_data_sqlite:
if self.options["sqlite3"].threadsafe == 0:
raise ConanInvalidConfiguration("sqlite3 must be built with threadsafe enabled")
if self.options.enable_netssl and self.options.get_safe("enable_netssl_win", False):
raise ConanInvalidConfiguration("Conflicting enable_netssl[_win] settings")

def requirements(self):
self.requires("pcre/8.44")
Expand All @@ -154,7 +155,7 @@ def requirements(self):
self.requires("apr-util/1.6.1")
# FIXME: missing apache2 recipe
raise ConanInvalidConfiguration("apache2 is not (yet) available on CCI")
if self.options.get_safe("enable_netssl", False) or \
if self.options.enable_netssl or \
self.options.enable_crypto or \
self.options.get_safe("enable_jwt", False):
self.requires("openssl/1.1.1k")
Expand Down