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

cmake: ExternalProject test tidy-ups

Browse source 
Follow-up to b8296d367a #18208

Closes #18214
This commit is contained in:
Viktor Szakats 2025-08-07 09:18:30 +02:00
parent d79269166e
commit 17bf8809ef
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/cmake/CMakeLists.txt
View file

@ -78,7 +78,7 @@ elseif(TEST_INTEGRATION_MODE STREQUAL "FetchContent")
elseif(TEST_INTEGRATION_MODE STREQUAL "ExternalProject")
include(ExternalProject)
set(_curl_install_dir "${CMAKE_BINARY_DIR}/curl-external-install")
set(_curl_libcurl_static_lib "${_curl_install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}curl${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(_curl_static_lib "${_curl_install_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}curl${CMAKE_STATIC_LIBRARY_SUFFIX}")
string(REPLACE " " ";" CURL_TEST_OPTS "${CURL_TEST_OPTS}")
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24)
set(_download_extract_timestamp "DOWNLOAD_EXTRACT_TIMESTAMP" "ON")
@ -91,16 +91,16 @@ elseif(TEST_INTEGRATION_MODE STREQUAL "ExternalProject")
-DCURL_ENABLE_SSL=OFF -DCURL_ENABLE_SSL=OFF -DCURL_DISABLE_LDAP=ON -DCURL_USE_LIBSSH2=OFF -DUSE_NGHTTP2=OFF
-DCURL_BROTLI=OFF -DCURL_ZLIB=OFF -DCURL_ZSTD=OFF -DUSE_LIBIDN2=OFF -DENABLE_IPV6=OFF
${CURL_TEST_OPTS}
BUILD_BYPRODUCTS "${_curl_libcurl_static_lib}")
BUILD_BYPRODUCTS "${_curl_static_lib}")
add_executable(test-consumer-static-fetch "test.c")
add_dependencies(test-consumer-static-fetch curl-external)
if(WIN32)
target_compile_definitions(test-consumer-static-fetch PRIVATE "CURL_STATICLIB")
list(APPEND _curl_libcurl_static_lib "ws2_32" "bcrypt")
list(APPEND _curl_static_lib "ws2_32" "bcrypt")
endif()
target_include_directories(test-consumer-static-fetch PRIVATE "${_curl_install_dir}/include")
target_link_libraries(test-consumer-static-fetch PRIVATE "${_curl_libcurl_static_lib}")
target_link_libraries(test-consumer-static-fetch PRIVATE "${_curl_static_lib}")
endif()
if(TEST_INTEGRATION_MODE STREQUAL "find_package" OR