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.

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

civetweb: Add missing CMake options #9303

Merged
merged 5 commits into from
Feb 14, 2022
Merged

civetweb: Add missing CMake options #9303

merged 5 commits into from
Feb 14, 2022

Conversation

jlouazel
Copy link
Contributor

@jlouazel jlouazel commented Feb 8, 2022

Specify library name and version: civetweb/1.15

This pull request aims to add more options available in civetweb's CMake. This change is confirmed to fix the issue I already reported and bring more modularity to this package.

This resolves #9302.

Note for reviewers

As this is the first time I am contributing, I am not sure how to deal with the versioning of my pull request. Technically speaking, there is only an update in the recipe itself as the code behind it didn't change, so I didn't change anything regarding the version. Please tell me if there is something I missed in the procedure. I appreciate any help you can provide.


  • I've read the guidelines for contributing.
  • I've followed the PEP8 style guides for Python code in the recipes.
  • I've used the latest Conan client version.
  • I've tried at least one configuration locally with the
    conan-center hook activated.

Signed-off-by: Jean-Baptiste Louazel <jb.louazel@gmail.com>
@CLAassistant
Copy link

CLAassistant commented Feb 8, 2022

CLA assistant check
All committers have signed the CLA.

@conan-center-bot

This comment has been minimized.

@jlouazel
Copy link
Contributor Author

jlouazel commented Feb 8, 2022

Failure in build 1 (fbcaba60500fe858751d7528edfbeeac0dd081ac):

An unexpected error happened and has been reported. Help is on its way! 🏇

I don't know if this is caused by something I did. If someone wants to jump in and explain this to me, I would genuinely appreciate it.

Signed-off-by: Jean-Baptiste Louazel <jb.louazel@gmail.com>
@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

Signed-off-by: Jean-Baptiste Louazel <jb.louazel@gmail.com>
Signed-off-by: Jean-Baptiste Louazel <jb.louazel@gmail.com>
Signed-off-by: Jean-Baptiste Louazel <jb.louazel@gmail.com>
@conan-center-bot

This comment has been minimized.

@conan-center-bot
Copy link
Collaborator

All green in build 5 (7ca17599683505960ebf7f2f5c12e664f936b8e4):

  • civetweb/1.15@:
    All packages built successfully! (All logs)

  • civetweb/1.14@:
    All packages built successfully! (All logs)

  • civetweb/1.13@:
    All packages built successfully! (All logs)

@@ -77,18 +101,32 @@ def _configure_cmake(self):
if self._cmake:
return self._cmake
self._cmake = CMake(self)
self._cmake.definitions["CIVETWEB_ENABLE_SSL"] = self.options.with_ssl

if self.options.with_ssl:
openssl_version = tools.Version(self.deps_cpp_info["openssl"].version[:-1])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would break with openssl greater then 3.x 🤔 maybe a validate check?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was already there before my PR, so I didn't touch it. I am not against taking the opportunity to do that as well. What would you recommend?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the first PR since... let's not block this good work, maybe follow up with another PR 🙏

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prince-chrismc Sure, will do!

@conan-center-bot conan-center-bot merged commit 0a9dffe into conan-io:master Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[package] civetweb/1.15: Missing CMake options
6 participants