From: Viktor Szakats Date: Tue, 9 Apr 2024 10:17:22 +0000 (+0000) Subject: cmake: use namespaced custom target names X-Git-Tag: curl-8_8_0~256 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d569aaaf8714e18db526c6a6f5de9b6c6d9af5a;p=thirdparty%2Fcurl.git cmake: use namespaced custom target names Rename custom target to namespaced (unique) names to avoid colliding with 3rd-party projects (e.g. libzip) built together with curl. Reported-by: hammlee96 on github Fixes #13324 Closes #13326 --- diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 19fff9b84a..cb79996458 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -38,7 +38,7 @@ if(BUILD_MISC_DOCS) DEPENDS "${_man_misc}.md" VERBATIM ) - add_custom_target("generate-${_man_misc}.1" ALL DEPENDS "${_man_target}") + add_custom_target("curl-generate-${_man_misc}.1" ALL DEPENDS "${_man_target}") if(NOT CURL_DISABLE_INSTALL) install(FILES "${_man_target}" DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) endif() diff --git a/docs/libcurl/CMakeLists.txt b/docs/libcurl/CMakeLists.txt index 04fe84b525..7eec1ab45a 100644 --- a/docs/libcurl/CMakeLists.txt +++ b/docs/libcurl/CMakeLists.txt @@ -73,7 +73,7 @@ add_custom_command(OUTPUT libcurl-symbols.md ) add_manual_pages(man_MANS) -add_custom_target(man ALL DEPENDS ${man_MANS}) +add_custom_target(curl-man ALL DEPENDS ${man_MANS}) if(NOT CURL_DISABLE_INSTALL) unset(_src) foreach(_f ${man_MANS}) diff --git a/docs/libcurl/opts/CMakeLists.txt b/docs/libcurl/opts/CMakeLists.txt index a20d0b9bf9..2037793fcc 100644 --- a/docs/libcurl/opts/CMakeLists.txt +++ b/docs/libcurl/opts/CMakeLists.txt @@ -26,8 +26,8 @@ transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc. include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") add_manual_pages(man_MANS) -add_custom_target(opts-man DEPENDS ${man_MANS}) -add_dependencies(man opts-man) +add_custom_target(curl-opts-man DEPENDS ${man_MANS}) +add_dependencies(curl-man curl-opts-man) if(NOT CURL_DISABLE_INSTALL) unset(_src) foreach(_f ${man_MANS})