curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-11 06:32:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmake: use LIB_NAME in curl-config.cmake.in

Browse Source 
Cherry-picked from #16973
Closes #17195
This commit is contained in:
Viktor Szakats 2025-04-26 09:17:32 +02:00
parent 54ef546ec4
commit f9eb9e5e23
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMake/curl-config.cmake.in
View File

@ -34,16 +34,16 @@ endif()
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
# Alias for either shared or static library # 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) 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) set_target_properties(@PROJECT_NAME@::@LIB_SELECTED@ PROPERTIES IMPORTED_GLOBAL TRUE)
endif() endif()
add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@) add_library(@PROJECT_NAME@::@LIB_NAME@ ALIAS @PROJECT_NAME@::@LIB_SELECTED@)
endif() endif()
# For compatibility with CMake's FindCURL.cmake # For compatibility with CMake's FindCURL.cmake
set(CURL_VERSION_STRING "@CURLVERSION@") 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_and_check(CURL_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
set(CURL_SUPPORTED_PROTOCOLS "@CURL_SUPPORTED_PROTOCOLS_LIST@") set(CURL_SUPPORTED_PROTOCOLS "@CURL_SUPPORTED_PROTOCOLS_LIST@")

3
CMakeLists.txt
View File

@ -170,6 +170,8 @@ else()
set(CURL_OS "\"${CMAKE_SYSTEM_NAME}\"") set(CURL_OS "\"${CMAKE_SYSTEM_NAME}\"")
endif() endif()
set(LIB_NAME "libcurl")
set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/include") set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES "${PROJECT_SOURCE_DIR}/include")
if(NOT DEFINED CMAKE_UNITY_BUILD_BATCH_SIZE) if(NOT DEFINED CMAKE_UNITY_BUILD_BATCH_SIZE)
@ -2459,6 +2461,7 @@ if(NOT CURL_DISABLE_INSTALL)
# Consumed custom variables: # Consumed custom variables:
# CURLVERSION # CURLVERSION
# LIB_NAME
# LIB_SELECTED # LIB_SELECTED
# TARGETS_EXPORT_NAME # TARGETS_EXPORT_NAME
# USE_OPENSSL OPENSSL_VERSION_MAJOR # USE_OPENSSL OPENSSL_VERSION_MAJOR

5
lib/CMakeLists.txt
View File

@ -21,8 +21,9 @@
# SPDX-License-Identifier: curl # 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 "BUILDING_LIBCURL")
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}") set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "${CURL_DEBUG_MACROS}")