cmake: ExternalProject test tidy-ups

Follow-up to b8296d367aa4277ee297d474fe438da687ffc5ec #18208

Closes #18214

diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index 03199a9d43097c965c24e18528dad2a83f87740a..386c2ddfc3a9ad28115478586c7da499669baa75 100644 (file)
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -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}
 

diff --git a/tests/cmake/CMakeLists.txt b/tests/cmake/CMakeLists.txt
index e1ec12194a0382345f94f525d96cd4bf12901c4c..2c3d0daeb824147db5e621f3fa8e8cc9fbbaf4bb 100644 (file)
--- a/tests/cmake/CMakeLists.txt
+++ b/tests/cmake/CMakeLists.txt
@@ -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