From: Daniel Stenberg Date: Fri, 19 Jan 2024 14:03:50 +0000 (+0100) Subject: cmake: when USE_MANUAL=YES, build the curl.1 man page X-Git-Tag: curl-8_6_0~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed420d9329f755fc33d6cbcb6139baf2812dec87;p=thirdparty%2Fcurl.git cmake: when USE_MANUAL=YES, build the curl.1 man page Fixes KNOWN_BUG 15.4 Closes #12742 --- diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 254bc8479f..f91ff63bb6 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -92,7 +92,6 @@ problems may have been fixed or changed somewhat since this was written. 15.1 cmake outputs: no version information available 15.2 support build with GnuTLS 15.3 unusable tool_hugehelp.c with MinGW - 15.4 build docs/curl.1 15.6 uses -lpthread instead of Threads::Threads 15.7 generated .pc file contains strange entries 15.8 libcurl.pc uses absolute library paths @@ -528,12 +527,6 @@ problems may have been fixed or changed somewhat since this was written. see https://github.com/curl/curl/issues/3125 -15.4 build docs/curl.1 - - The cmake build does not create the docs/curl.1 file and therefore must rely on - it being there already. This makes the --manual option not work and test - cases like 1139 cannot function. - 15.6 uses -lpthread instead of Threads::Threads See https://github.com/curl/curl/issues/6166 diff --git a/docs/cmdline-opts/CMakeLists.txt b/docs/cmdline-opts/CMakeLists.txt index 3dd8be49b1..e6221855f9 100644 --- a/docs/cmdline-opts/CMakeLists.txt +++ b/docs/cmdline-opts/CMakeLists.txt @@ -28,8 +28,7 @@ transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc. include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") add_custom_command(OUTPUT "${MANPAGE}" - COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/gen.pl" mainpage "${CMAKE_CURRENT_SOURCE_DIR}" > "${MANPAGE}" - DEPENDS ${DPAGES} ${OTHERPAGES} + COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && "${PERL_EXECUTABLE}" "./gen.pl" mainpage ${DPAGES} > "${MANPAGE}" VERBATIM ) add_custom_target(generate-curl.1 DEPENDS "${MANPAGE}")