CMake build updates.

Author: kinyoklion

libs/internal/src/CMakeLists.txt

@@ -49,7 +49,6 @@ set(INTERNAL_SOURCES
 
 if (LD_CURL_NETWORKING)
     message(STATUS "LaunchDarkly Internal: CURL networking enabled")
-    find_package(CURL REQUIRED)
     list(APPEND INTERNAL_SOURCES network/curl_requester.cpp)
 endif()
 
@@ -70,7 +69,7 @@ target_link_libraries(${LIBNAME}
         PRIVATE Boost::url Boost::json OpenSSL::SSL Boost::disable_autolinking Boost::headers tl::expected foxy)
 
 if (LD_CURL_NETWORKING)
-    target_link_libraries(${LIBNAME} PRIVATE CURL::libcurl launchdarkly::networking)
+    target_link_libraries(${LIBNAME} PRIVATE launchdarkly::networking)
     target_compile_definitions(${LIBNAME} PRIVATE LD_CURL_NETWORKING)
 endif()
 

libs/networking/include/launchdarkly/network/curl_multi_manager.hpp

@@ -60,7 +60,7 @@ class CurlMultiManager : public std::enable_shared_from_this<CurlMultiManager> {
      * @param headers The curl_slist headers (will be freed automatically)
      * @param callback Called when the transfer completes
      */
-    void add_handle(std::shared_ptr<CURL> easy,
+    void add_handle(const std::shared_ptr<CURL>& easy,
                     curl_slist* headers,
                     CompletionCallback callback);
 

libs/networking/src/CMakeLists.txt

@@ -15,9 +15,10 @@ add_library(launchdarkly::networking ALIAS ${LIBNAME})
 message(STATUS "LaunchDarklyNetworking_SOURCE_DIR=${LaunchDarklyNetworking_SOURCE_DIR}")
 
 target_link_libraries(${LIBNAME}
+        PUBLIC
+        CURL::libcurl
         PRIVATE
         Boost::headers
-        CURL::libcurl
         Boost::disable_autolinking
 )
 

libs/networking/src/curl_multi_manager.cpp

@@ -42,13 +42,11 @@ CurlMultiManager::~CurlMultiManager() {
                 header_it != headers_.end() && header_it->second) {
                 curl_slist_free_all(header_it->second);
             }
-
-            // curl_easy_cleanup(easy);
         }
     }
 }
 
-void CurlMultiManager::add_handle(std::shared_ptr<CURL> easy,
+void CurlMultiManager::add_handle(const std::shared_ptr<CURL>& easy,
                                   curl_slist* headers,
                                   CompletionCallback callback) {
     if (const CURLMcode rc = curl_multi_add_handle(

libs/server-sent-events/src/CMakeLists.txt

@@ -16,7 +16,6 @@ set(SSE_SOURCES
 
 if (LD_CURL_NETWORKING)
     message(STATUS "LaunchDarkly SSE: CURL networking enabled")
-    find_package(CURL REQUIRED)
     list(APPEND SSE_SOURCES curl_client.cpp)
 endif()
 
@@ -28,7 +27,7 @@ target_link_libraries(${LIBNAME}
 )
 
 if (LD_CURL_NETWORKING)
-    target_link_libraries(${LIBNAME} PRIVATE CURL::libcurl launchdarkly::networking)
+    target_link_libraries(${LIBNAME} PRIVATE launchdarkly::networking)
     target_compile_definitions(${LIBNAME} PRIVATE LD_CURL_NETWORKING)
 endif()