From: Viktor Szakats Date: Sat, 26 Apr 2025 07:17:32 +0000 (+0200) Subject: cmake: use `LIB_NAME` in `curl-config.cmake.in` X-Git-Tag: curl-8_14_0~205 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9eb9e5e23262705d2b108f7cf03a920dd77d7ae;p=thirdparty%2Fcurl.git cmake: use `LIB_NAME` in `curl-config.cmake.in` Cherry-picked from #16973 Closes #17195 --- diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in index 4788afb8c7..e21c7b626d 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in @@ -34,16 +34,16 @@ endif() include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") # Alias for either shared or static library -if(NOT TARGET @PROJECT_NAME@::libcurl) +if(NOT TARGET @PROJECT_NAME@::@LIB_NAME@) if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.11 AND CMAKE_VERSION VERSION_LESS 3.18) set_target_properties(@PROJECT_NAME@::@LIB_SELECTED@ PROPERTIES IMPORTED_GLOBAL TRUE) endif() - add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@) + add_library(@PROJECT_NAME@::@LIB_NAME@ ALIAS @PROJECT_NAME@::@LIB_SELECTED@) endif() # For compatibility with CMake's FindCURL.cmake set(CURL_VERSION_STRING "@CURLVERSION@") -set(CURL_LIBRARIES @PROJECT_NAME@::libcurl) +set(CURL_LIBRARIES @PROJECT_NAME@::@LIB_NAME@) set_and_check(CURL_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") set(CURL_SUPPORTED_PROTOCOLS "@CURL_SUPPORTED_PROTOCOLS_LIST@") diff --git a/CMakeLists.txt b/CMakeLists.txt index a271ff80a5..178fd93d92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,6 +170,8 @@ else() set(CURL_OS "\"${CMAKE_SYSTEM_NAME}\"") endif() +set(LIB_NAME "libcurl") + set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/include") if(NOT DEFINED CMAKE_UNITY_BUILD_BATCH_SIZE) @@ -2459,6 +2461,7 @@ if(NOT CURL_DISABLE_INSTALL) # Consumed custom variables: # CURLVERSION + # LIB_NAME # LIB_SELECTED # TARGETS_EXPORT_NAME # USE_OPENSSL OPENSSL_VERSION_MAJOR diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f2c3e0e99a..61a679c018 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -21,8 +21,9 @@ # SPDX-License-Identifier: curl # ########################################################################### -set(LIB_NAME "libcurl") -set(LIBCURL_OUTPUT_NAME "libcurl" CACHE STRING "Basename of the curl library") + +set(LIBCURL_OUTPUT_NAME "${LIB_NAME}" CACHE STRING "Basename of the curl library") + set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_LIBCURL") set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")