cmake: rework options to enable curl and libcurl docs#12773
cmake: rework options to enable curl and libcurl docs#12773vszakats wants to merge 9 commits intocurl:masterfrom
Conversation
- `ENABLE_MANUAL`: build man page and built-in manual for curl tool - `BUILD_DOCS`: build man pages for libcurl `USE_MANUAL` in CMake means we have the necessary tool to build these, which also propagates down to C to enable the built-in manual for curl tool. Ref: curl#12771 Closes #xxxxx
levitte
left a comment
There was a problem hiding this comment.
If I may, I think that it's still useful to have USE_MANUAL up front, including in curl_config.h. I believe these changes acheive that
|
I gotta admit, I still find it a bit weird that curl.1 wouldn't be built as part of building the docs, regardless of if However, there is also |
Co-authored-by: Richard Levitte <levitte@openssl.org>
|
We can rename As for --- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -25,6 +25,6 @@
if(BUILD_DOCS)
add_subdirectory(libcurl)
endif()
-if(ENABLE_MANUAL)
+if(ENABLE_MANUAL AND BUILD_CURL_EXE)
add_subdirectory(cmdline-opts)
endif() |
That would be much less confusing, so yes please
Looks good to me |
|
Thanks, committed these updates. |
BUILD_DOCS from ENABLE_MANUAL
Reviewing curl-for-win script again, this remains having another Doing the rebuild only when Perhaps an approach where we have a static In any case this is left for a separate PR. |
|
Re this discussion, I clearly don't have a deeper understanding of all the ramifications, so I defer to your knowledge. |
Rework CMake options for building/using curl tool and libcurl manuals.
rename
ENABLE_MANUALtoENABLE_CURL_MANUAL, meaning:to build man page and built-in manual for curl tool.
rename
BUILD_DOCStoBUILD_LIBCURL_DOCS, meaning:to build man pages for libcurl.
BUILD_LIBCURL_DOCSnow works without having to enableENABLE_CURL_MANUALtoo.drop support for existing CMake-level
USE_MANUALoption to avoidconfusion. (It used to work with the effect of current
ENABLE_CURL_MANUAL, but only by accident.)Ref: #12771
Closes #12773