Set POSITION_INDEPENDENT_CODE on libcurl

Also don't export the curl dependency.
rapidsai · Feb 7, 2025 · d9f2315 · d9f2315
1 parent b5758ec
commit d9f2315
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -62,6 +62,7 @@ rapids_find_package(
 
 if(KvikIO_REMOTE_SUPPORT)
   include(cmake/thirdparty/get_libcurl.cmake)
+  set_target_properties(CURL::libcurl PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
 
 set(cuFile_FOUND 0)
@@ -246,6 +247,7 @@ set(final_code_string
     "
 set(KvikIO_CUDA_SUPPORT [=[${KvikIO_CUDA_SUPPORT}]=])
 set(KvikIO_CUFILE_SUPPORT [=[${cuFile_FOUND}]=])
+set(KvikIO_REMOTE_SUPPORT [=[${KvikIO_REMOTE_SUPPORT}]=])
 "
 )
 string(

diff --git a/cpp/cmake/thirdparty/get_libcurl.cmake b/cpp/cmake/thirdparty/get_libcurl.cmake
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2024, NVIDIA CORPORATION.
+# Copyright (c) 2024-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -24,8 +24,6 @@ function(find_and_configure_libcurl)
   rapids_cpm_find(
     CURL 8.5.0
     GLOBAL_TARGETS libcurl
-    BUILD_EXPORT_SET kvikio-exports
-    INSTALL_EXPORT_SET kvikio-exports
     CPM_ARGS
     GIT_REPOSITORY https://github.com/curl/curl
     GIT_TAG curl-8_5_0

diff --git a/python/kvikio/kvikio/_lib/CMakeLists.txt b/python/kvikio/kvikio/_lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -17,7 +17,7 @@ set(cython_modules arr.pyx buffer.pyx defaults.pyx cufile_driver.pyx file_handle
                    libnvcomp.pyx libnvcomp_ll.pyx
 )
 
-if(TARGET CURL::libcurl)
+if(KvikIO_REMOTE_SUPPORT)
   message(STATUS "Building remote_handle.pyx (libcurl found)")
   list(APPEND cython_modules remote_handle.pyx)
 else()