From 395984a125d1d9fda9c4f6743014064fbec9d303 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 21 Oct 2024 16:02:49 -0400 Subject: [PATCH 1/4] Disabling curl tests doesn't now disable kvikio cpp tests Works around https://github.com/curl/curl/issues/15351 . We cache the `BUILD_TESTING` cache variable when it exists so that our tests are enabled when building curl from source. --- cpp/cmake/thirdparty/get_libcurl.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cpp/cmake/thirdparty/get_libcurl.cmake b/cpp/cmake/thirdparty/get_libcurl.cmake index 7695592737..ce756a8cf1 100644 --- a/cpp/cmake/thirdparty/get_libcurl.cmake +++ b/cpp/cmake/thirdparty/get_libcurl.cmake @@ -16,6 +16,11 @@ function(find_and_configure_libcurl) include(${rapids-cmake-dir}/cpm/find.cmake) + # Work around https://github.com/curl/curl/issues/15351 + if(DEFINED CACHE{BUILD_TESTING}) + set(CACHE_HAS_BUILD_TESTING $CACHE{BUILD_TESTING}) + endif() + rapids_cpm_find( CURL 7.87.0 GLOBAL_TARGETS libcurl @@ -27,6 +32,11 @@ function(find_and_configure_libcurl) OPTIONS "BUILD_CURL_EXE OFF" "BUILD_SHARED_LIBS OFF" "BUILD_TESTING OFF" "CURL_USE_LIBPSL OFF" "CURL_DISABLE_LDAP ON" "CMAKE_POSITION_INDEPENDENT_CODE ON" ) + if(DEFINED CACHE_HAS_BUILD_TESTING) + set(BUILD_TESTING ${CACHE_HAS_BUILD_TESTING} CACHE BOOL "" FORCE) + else() + unset(BUILD_TESTING CACHE) + endif() endfunction() find_and_configure_libcurl() From 34d85f345b0c2e1c9562a6ab3f7480f2c1f9999e Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 21 Oct 2024 16:09:08 -0400 Subject: [PATCH 2/4] Correct style issues found by CI --- cpp/cmake/thirdparty/get_libcurl.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_libcurl.cmake b/cpp/cmake/thirdparty/get_libcurl.cmake index ce756a8cf1..a84d21442f 100644 --- a/cpp/cmake/thirdparty/get_libcurl.cmake +++ b/cpp/cmake/thirdparty/get_libcurl.cmake @@ -33,7 +33,9 @@ function(find_and_configure_libcurl) "CURL_DISABLE_LDAP ON" "CMAKE_POSITION_INDEPENDENT_CODE ON" ) if(DEFINED CACHE_HAS_BUILD_TESTING) - set(BUILD_TESTING ${CACHE_HAS_BUILD_TESTING} CACHE BOOL "" FORCE) + set(BUILD_TESTING + ${CACHE_HAS_BUILD_TESTING} + CACHE BOOL "" FORCE) else() unset(BUILD_TESTING CACHE) endif() From b142f66ff8445730d2a6ba0c666424c0c55764e2 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 21 Oct 2024 16:35:13 -0400 Subject: [PATCH 3/4] Correct style issues found by CI --- cpp/cmake/thirdparty/get_libcurl.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_libcurl.cmake b/cpp/cmake/thirdparty/get_libcurl.cmake index a84d21442f..225dc62bfa 100644 --- a/cpp/cmake/thirdparty/get_libcurl.cmake +++ b/cpp/cmake/thirdparty/get_libcurl.cmake @@ -34,8 +34,8 @@ function(find_and_configure_libcurl) ) if(DEFINED CACHE_HAS_BUILD_TESTING) set(BUILD_TESTING - ${CACHE_HAS_BUILD_TESTING} - CACHE BOOL "" FORCE) + ${CACHE_HAS_BUILD_TESTING} + CACHE BOOL "" FORCE) else() unset(BUILD_TESTING CACHE) endif() From e8ecb4879962e35bd7038824a2ad866bb4f749fb Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 21 Oct 2024 16:41:54 -0400 Subject: [PATCH 4/4] Correct style issues found by CI --- cpp/cmake/thirdparty/get_libcurl.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_libcurl.cmake b/cpp/cmake/thirdparty/get_libcurl.cmake index 225dc62bfa..5694494b9a 100644 --- a/cpp/cmake/thirdparty/get_libcurl.cmake +++ b/cpp/cmake/thirdparty/get_libcurl.cmake @@ -35,7 +35,8 @@ function(find_and_configure_libcurl) if(DEFINED CACHE_HAS_BUILD_TESTING) set(BUILD_TESTING ${CACHE_HAS_BUILD_TESTING} - CACHE BOOL "" FORCE) + CACHE BOOL "" FORCE + ) else() unset(BUILD_TESTING CACHE) endif()