From 3a60926f658161d7a0df73be64b71f57075bf3a4 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Wed, 14 May 2025 00:44:46 +0200 Subject: [PATCH] Link with libcurl. --- cmake/vendor.cmake | 24 ++++++++++++++++++++++++ profiler/CMakeLists.txt | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 7a4fc12a..1804211d 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -11,6 +11,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake) option(DOWNLOAD_CAPSTONE "Force download capstone" ON) option(DOWNLOAD_GLFW "Force download glfw" OFF) option(DOWNLOAD_FREETYPE "Force download freetype" OFF) +option(DOWNLOAD_LIBCURL "Force download libcURL" OFF) # capstone @@ -113,6 +114,29 @@ CPMAddPackage( SOURCE_SUBDIR build/cmake ) +# libcurl + +pkg_check_modules(LIBCURL libcurl) +if (LIBCURL_FOUND AND NOT DOWNLOAD_LIBCURL) + add_library(TracyLibcurl INTERFACE) + target_include_directories(TracyLibcurl INTERFACE ${LIBCURL_INCLUDE_DIRS}) + target_link_libraries(TracyLibcurl INTERFACE ${LIBCURL_LINK_LIBRARIES}) +else() + CPMAddPackage( + NAME libcurl + GITHUB_REPOSITORY curl/curl + GIT_TAG curl-8_13_0 + OPTIONS + "BUILD_STATIC_LIBS ON" + "BUILD_SHARED_LIBS OFF" + "HTTP_ONLY ON" + "CURL_ZSTD OFF" + EXCLUDE_FROM_ALL TRUE + ) + add_library(TracyLibcurl INTERFACE) + target_link_libraries(TracyLibcurl INTERFACE curl) +endif() + # Diff Template Library set(DTL_DIR "${ROOT_DIR}/dtl") diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 414c0296..27d759e0 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -207,7 +207,7 @@ else() endif() find_package(Threads REQUIRED) -target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyImGui Threads::Threads) +target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyImGui Threads::Threads TracyLibcurl) target_include_directories(${PROJECT_NAME} PRIVATE ${ollama-hpp_SOURCE_DIR}/include) if(NOT DEFINED GIT_REV)