romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-04 16:54:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename to match autotools

Browse source
This commit is contained in:
Viktor Szakats 2025-06-21 20:34:24 +02:00
parent 5925a1ea12
commit c43667f5ae
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -361,8 +361,8 @@ endif()
option(CURL_USE_PKGCONFIG "Enable pkg-config to detect dependencies" ${_curl_use_pkgconfig_default})
# Initialize variables collecting dependency libs, paths, pkg-config names.
set(CURL_NETWORK_AND_TIME_LIBS "")
set(CURL_LIBS "")
set(CURL_LIBS_SOCKET "")
set(CURL_LIBDIRS "")
set(LIBCURL_PC_REQUIRES_PRIVATE "")
@ -543,9 +543,9 @@ endif()
# If we are on Haiku, make sure that the network library is brought in.
if(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
list(APPEND CURL_LIBS_SOCKET "network")
list(APPEND CURL_NETWORK_AND_TIME_LIBS "network")
elseif(AMIGA)
list(APPEND CURL_LIBS_SOCKET "net" "m" "atomic")
list(APPEND CURL_NETWORK_AND_TIME_LIBS "net" "m" "atomic")
list(APPEND CMAKE_REQUIRED_LIBRARIES "net" "m" "atomic")
endif()
@ -613,7 +613,7 @@ elseif(DOS)
if(WATT_ROOT)
set(USE_WATT32 ON)
# FIXME upstream: must specify the full path to avoid CMake converting "watt" to "watt.lib"
list(APPEND CURL_LIBS_SOCKET "${WATT_ROOT}/lib/libwatt.a")
list(APPEND CURL_NETWORK_AND_TIME_LIBS "${WATT_ROOT}/lib/libwatt.a")
include_directories(SYSTEM "${WATT_ROOT}/inc")
list(APPEND CMAKE_REQUIRED_INCLUDES "${WATT_ROOT}/inc")
else()
@ -633,7 +633,7 @@ elseif(AMIGA)
elseif(NOT APPLE)
check_library_exists("socket" "connect" "" HAVE_LIBSOCKET)
if(HAVE_LIBSOCKET)
set(CURL_LIBS_SOCKET "socket" ${CURL_LIBS})
set(CURL_NETWORK_AND_TIME_LIBS "socket" ${CURL_LIBS})
endif()
endif()
@ -1955,7 +1955,7 @@ include(CMake/OtherTests.cmake)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "HAVE_CONFIG_H")
if(WIN32)
list(APPEND CURL_LIBS_SOCKET "${_win32_winsock}")
list(APPEND CURL_NETWORK_AND_TIME_LIBS "${_win32_winsock}")
if(NOT WINCE AND NOT WINDOWS_STORE)
list(APPEND CURL_LIBS "iphlpapi")
endif()
@ -1984,7 +1984,7 @@ if(WIN32)
endif()
endif()
list(APPEND CURL_LIBS ${CURL_LIBS_SOCKET})
list(APPEND CURL_LIBS ${CURL_NETWORK_AND_TIME_LIBS})
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") # MSVC but exclude clang-cl
set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS "-MP") # Parallel compilation

2
tests/server/CMakeLists.txt
View file

@ -36,7 +36,7 @@ add_custom_command(OUTPUT "${BUNDLE}.c"
add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c")
add_dependencies(testdeps ${BUNDLE})
target_link_libraries(${BUNDLE} ${CURL_LIBS_SOCKET})
target_link_libraries(${BUNDLE} ${CURL_NETWORK_AND_TIME_LIBS})
target_include_directories(${BUNDLE} PRIVATE
"${PROJECT_BINARY_DIR}/lib" # for "curl_config.h"
"${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h", curlx