libcurl: Improve CMake support #26063
Open
+63
−152
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AbrilRBS
commented
Dec 10, 2024
| @@ -596,7 +545,14 @@ def _generate_with_cmake(self): | |||
| tc.variables["CURL_ZLIB"] = self.options.with_zlib | |||
| tc.variables["CURL_BROTLI"] = self.options.with_brotli | |||
| tc.variables["CURL_ZSTD"] = self.options.with_zstd | |||
| if self.options.with_zstd: | |||
| # Can't force CMakeDeps to generate this | |||
| tc.cache_variables["ZSTD_FOUND"] = True | |||
There was a problem hiding this comment.
This is the main stopping point for this PR. Ideally we would have a way that CMakeDeps listens to the set_properties for these versions
There was a problem hiding this comment.
Discussion in conan-io/conan#17483
1 task
AbrilRBS
commented
Dec 24, 2024
| @@ -668,17 +639,12 @@ def package_info(self): | |||
| self.cpp_info.components["curl"].libs = ["libcurl_imp"] if self.options.shared else ["libcurl"] | |||
| else: | |||
| self.cpp_info.components["curl"].libs = ["curl"] | |||
| if self.settings.os in ["Linux", "FreeBSD"]: | |||
| if self.options.with_libidn: | |||
| self.cpp_info.components["curl"].libs.append("idn") | |||
There was a problem hiding this comment.
No idn library is generated for this option, it's just a library used as a dependency, my geuss is that this never worked, but I have to double check where this comes from before merging
AbrilRBS
commented
Dec 24, 2024
| @@ -583,6 +516,8 @@ def _generate_with_cmake(self): | |||
| tc = CMakeToolchain(self) | |||
| tc.variables["ENABLE_UNICODE"] = True | |||
| tc.variables["BUILD_TESTING"] = False | |||
| tc.cache_variables["BUILD_LIBCURL_DOCS"] = False | |||
There was a problem hiding this comment.
This should listen to the with_docs option
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Changes to recipe: libcurl/[*]
Motivation
This PR started as a fix for the linked issue, but evolved to remove all the patching necessary when CMakeDeps was not as powerful as it is today.
Details
Closes #26054