fix(build): make CURL optional so dflash_server links without libcurl#354
Merged
Merged
Conversation
Gate curl-dependent http_server code under DFLASH_HAS_CURL; CMake only defines it + links CURL::libcurl when found.
This file contains hidden or 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
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.
Re-carved from #274 as a standalone change off current
main.Gates all libcurl usage in
http_server.cppbehindDFLASH_HAS_CURL; CMake buildsdflash_serverunconditionally and only defines the macro + linksCURL::libcurlwhenfind_package(CURL)succeeds. Without libcurl the passthrough proxy compiles out and the server still builds.Re-carved (not cherry-picked): #294's passthrough-proxy added two
curl_forwardcall sites (http_server.cpp:1888,:1909) beyond the original commit; both are now gated.Verified on a box without libcurl-dev:
cmakeconfigure succeeds andhttp_server.cppcompiles clean withDFLASH_HAS_CURLundefined. 2 files, +34/-24.