luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: fix to show features/protocols with CURL_DISABLE_INSTALL=ON

Browse Source 
Follow-up to aace27b096 #12287

Closes #14803
This commit is contained in:
Viktor Szakats 2024-09-06 01:42:47 +02:00
parent 1fdea16846
commit 0cdd9afd1e
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 142 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -1811,15 +1811,6 @@ if(BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()
if(NOT CURL_DISABLE_INSTALL)
install(FILES "${PROJECT_SOURCE_DIR}/scripts/mk-ca-bundle.pl"
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
# Helper to populate a list (_items) with a label when conditions # Helper to populate a list (_items) with a label when conditions
# (the remaining args) are satisfied # (the remaining args) are satisfied
macro(_add_if _label) macro(_add_if _label)
@ -1961,6 +1952,8 @@ if(NOT CURL_DISABLE_INSTALL)
message(STATUS "Default SSL backend: ${CURL_DEFAULT_SSL_BACKEND}") message(STATUS "Default SSL backend: ${CURL_DEFAULT_SSL_BACKEND}")
endif() endif()
if(NOT CURL_DISABLE_INSTALL)
# curl-config needs the following options to be set. # curl-config needs the following options to be set.
set(CC "${CMAKE_C_COMPILER}") set(CC "${CMAKE_C_COMPILER}")
# TODO: probably put a -D... options here? # TODO: probably put a -D... options here?
@ -2180,4 +2173,11 @@ if(NOT CURL_DISABLE_INSTALL)
add_custom_target(curl_uninstall add_custom_target(curl_uninstall
COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake") COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/CMake/cmake_uninstall.cmake")
endif() endif()
install(FILES "${PROJECT_SOURCE_DIR}/scripts/mk-ca-bundle.pl"
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS
OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
endif() endif()