Mirrors/curl
0
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-01-18 17:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmake: replace deprecated PERL_FOUND with Perl_FOUND

Browse Source 
`Perl_FOUND` available since CMake v3.3.
`PERL_FOUND` deprecated since v4.2.

Ref: https://cmake.org/cmake/help/v4.2/module/FindPerl.html

Closes #20011
This commit is contained in:
Viktor Szakats
2025-12-17 15:51:24 +01:00
parent cd046f6c93
commit 14d5b6c7a7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -520,7 +520,7 @@ option(BUILD_LIBCURL_DOCS "Build libcurl man pages" ON)
option(BUILD_MISC_DOCS "Build misc man pages (e.g. curl-config and mk-ca-bundle)" ON) option(BUILD_MISC_DOCS "Build misc man pages (e.g. curl-config and mk-ca-bundle)" ON)
option(ENABLE_CURL_MANUAL "Build the man page for curl and enable its -M/--manual option" ON) option(ENABLE_CURL_MANUAL "Build the man page for curl and enable its -M/--manual option" ON)
if((ENABLE_CURL_MANUAL OR BUILD_LIBCURL_DOCS) AND NOT PERL_FOUND) if((ENABLE_CURL_MANUAL OR BUILD_LIBCURL_DOCS) AND NOT Perl_FOUND)
message(WARNING "Perl not found. Will not build manuals.") message(WARNING "Perl not found. Will not build manuals.")
endif() endif()
@@ -1864,13 +1864,13 @@ set(_project_config "${_generated_dir}/${PROJECT_NAME}Config.cmake")
set(_version_config "${_generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") set(_version_config "${_generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
option(BUILD_TESTING "Build tests" ON) option(BUILD_TESTING "Build tests" ON)
if(BUILD_TESTING AND PERL_FOUND) if(BUILD_TESTING AND Perl_FOUND)
set(CURL_BUILD_TESTING ON) set(CURL_BUILD_TESTING ON)
else() else()
set(CURL_BUILD_TESTING OFF) set(CURL_BUILD_TESTING OFF)
endif() endif()
if(PERL_FOUND) if(Perl_FOUND)
set(CURL_MANPAGE "${PROJECT_BINARY_DIR}/docs/cmdline-opts/curl.1") set(CURL_MANPAGE "${PROJECT_BINARY_DIR}/docs/cmdline-opts/curl.1")
set(CURL_ASCIIPAGE "${PROJECT_BINARY_DIR}/docs/cmdline-opts/curl.txt") set(CURL_ASCIIPAGE "${PROJECT_BINARY_DIR}/docs/cmdline-opts/curl.txt")
add_subdirectory(docs) add_subdirectory(docs)

2
scripts/CMakeLists.txt
View File

@@ -27,7 +27,7 @@ option(CURL_COMPLETION_ZSH "Install zsh completions" OFF)
if(CURL_COMPLETION_FISH OR if(CURL_COMPLETION_FISH OR
CURL_COMPLETION_ZSH) CURL_COMPLETION_ZSH)
if(PERL_FOUND) if(Perl_FOUND)
if(CURL_COMPLETION_FISH) if(CURL_COMPLETION_FISH)
set(_completion_fish "${CMAKE_CURRENT_BINARY_DIR}/curl.fish") set(_completion_fish "${CMAKE_CURRENT_BINARY_DIR}/curl.fish")
add_custom_command(OUTPUT "${_completion_fish}" add_custom_command(OUTPUT "${_completion_fish}"

6
src/CMakeLists.txt
View File

@@ -28,8 +28,8 @@ set(_curl_cfiles_gen "")
set(_curl_hfiles_gen "") set(_curl_hfiles_gen "")
set(_curl_definitions "") set(_curl_definitions "")
if(ENABLE_CURL_MANUAL AND (PERL_FOUND OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tool_hugehelp.c")) if(ENABLE_CURL_MANUAL AND (Perl_FOUND OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tool_hugehelp.c"))
if(PERL_FOUND) if(Perl_FOUND)
add_custom_command(OUTPUT "tool_hugehelp.c" add_custom_command(OUTPUT "tool_hugehelp.c"
COMMAND ${CMAKE_COMMAND} -E echo "#include \"tool_setup.h\"" > "tool_hugehelp.c" COMMAND ${CMAKE_COMMAND} -E echo "#include \"tool_setup.h\"" > "tool_hugehelp.c"
COMMAND ${CMAKE_COMMAND} -E echo "/* !checksrc! disable COPYRIGHT all */" >> "tool_hugehelp.c" COMMAND ${CMAKE_COMMAND} -E echo "/* !checksrc! disable COPYRIGHT all */" >> "tool_hugehelp.c"
@@ -55,7 +55,7 @@ if(ENABLE_CURL_MANUAL AND (PERL_FOUND OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/too
endif() endif()
if(CURL_CA_EMBED_SET) if(CURL_CA_EMBED_SET)
if(PERL_FOUND) if(Perl_FOUND)
add_custom_command(OUTPUT "tool_ca_embed.c" add_custom_command(OUTPUT "tool_ca_embed.c"
COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mk-file-embed.pl" --var curl_ca_embed COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mk-file-embed.pl" --var curl_ca_embed
< "${CURL_CA_EMBED}" > "tool_ca_embed.c" < "${CURL_CA_EMBED}" > "tool_ca_embed.c"