git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/distcheck.yml vendored
View File

@ -302,7 +302,7 @@ jobs:
persist-credentials: false
- name: 'via ExternalProject'
if: ${{ !contains(matrix.image, 'linux') }}
if: ${{ !contains(matrix.image, 'ubuntu') }}
run: ./tests/cmake/test.sh ExternalProject ${TESTOPTS}
- name: 'via FetchContent'
run: ./tests/cmake/test.sh FetchContent ${TESTOPTS} -DCURL_USE_OPENSSL=ON
@ -312,16 +312,15 @@ jobs:
run: ./tests/cmake/test.sh find_package ${TESTOPTS} -DCURL_USE_OPENSSL=ON
- name: 'via ExternalProject (old cmake)'
if: ${{ contains(matrix.image, 'linux') }}
if: ${{ contains(matrix.image, 'ubuntu') }}
run: |
export TEST_CMAKE_CONSUMER; TEST_CMAKE_CONSUMER="$(cat ~/old-cmake-path.txt)"
if [[ "${MATRIX_IMAGE}" = *'macos'* ]]; then
export CFLAGS='-arch arm64'
export TEST_CMAKE_FLAGS='-DCURL_USE_LIBPSL=OFF' # auto-detection does not work with old-cmake
fi
if [[ "${MATRIX_IMAGE}" = *'windows'* ]]; then
export TEST_CMAKE_GENERATOR='MSYS Makefiles'
export TEST_CMAKE_FLAGS='-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DOPENSSL_ROOT_DIR=C:/msys64/mingw64'
export TEST_CMAKE_FLAGS='-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc'
fi
./tests/cmake/test.sh ExternalProject ${TESTOPTS}

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