From 74542c1f4bfea75f92562075370fd839891cc440 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 27 Apr 2026 17:00:41 +0200 Subject: [PATCH] cmake: do not install `wcurl` when `BUILD_CURL_EXE=OFF` Skip installing `wcurl.1` also. Reported-by: Daniel Schulte Fixes #21458 Follow-up to 23bed347b38922779382599f8b72c4d762add7bd #17035 Closes #21459 --- CMakeLists.txt | 14 ++++++++------ docs/CMakeLists.txt | 7 ++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 611388024f..5dd9c7aa70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2428,12 +2428,14 @@ if(NOT CURL_DISABLE_INSTALL) COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake") endif() - install(FILES "${PROJECT_SOURCE_DIR}/scripts/wcurl" - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) + if(BUILD_CURL_EXE) + install(FILES "${PROJECT_SOURCE_DIR}/scripts/wcurl" + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) + endif() # The `-DEV` part is important string(REGEX REPLACE "([0-9]+\.[0-9]+)\.([0-9]+.*)" "\\2" CPACK_PACKAGE_VERSION_PATCH "${_curl_version}") diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 5f342954cc..9bc0790b09 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -30,7 +30,12 @@ if(ENABLE_CURL_MANUAL AND BUILD_CURL_EXE) endif() if(BUILD_MISC_DOCS) - foreach(_man_misc IN ITEMS "curl-config" "mk-ca-bundle" "wcurl" "runtests" "testcurl") + set(_man_targets "curl-config" "mk-ca-bundle" "runtests" "testcurl") + if(BUILD_CURL_EXE) + list(APPEND _man_targets "wcurl") + endif() + + foreach(_man_misc IN LISTS _man_targets) set(_man_target "${CMAKE_CURRENT_BINARY_DIR}/${_man_misc}.1") add_custom_command(OUTPUT "${_man_target}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}