]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
cmake: use namespaced custom target names
authorViktor Szakats <commit@vsz.me>
Tue, 9 Apr 2024 10:17:22 +0000 (10:17 +0000)
committerViktor Szakats <commit@vsz.me>
Tue, 9 Apr 2024 21:20:54 +0000 (21:20 +0000)
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

docs/CMakeLists.txt
docs/libcurl/CMakeLists.txt
docs/libcurl/opts/CMakeLists.txt

index 19fff9b84a1a242166470f6fe9184d3d14bcc09b..cb799964581e06adc3ace94e379c47db9d12bdfb 100644 (file)
@@ -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()
index 04fe84b525ce5b51b3747ffb4d3594c613a86e44..7eec1ab45aaee344dcaa579339601eeba9602667 100644 (file)
@@ -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})
index a20d0b9bf9ee9e0dc0e4820a0a20685f63aaf40a..2037793fcc7c3b80cab03532c87d39cf96593cc3 100644 (file)
@@ -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})