Link gRPC libraries in ClovaAPIs and GoogleAPIs CMake configurations;…

… update LibCurl version and hashes
locaal-ai · Dec 3, 2024 · b83c8a5 · b83c8a5
1 parent 826c30e
commit b83c8a5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/cmake/BuildClovaAPIs.cmake b/cmake/BuildClovaAPIs.cmake
@@ -34,5 +34,9 @@ endif()
 target_include_directories(clova-apis PUBLIC ${CLOVA_OUTPUT_DIR} ${GRPC_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIR}
                                              ${absl_INCLUDE_DIRS})
 
+# link the grpc libraries
+target_link_libraries(clova-apis PRIVATE ${GRPC_LIBRARIES})
+target_link_directories(clova-apis PRIVATE ${GRPC_LIB_DIR})
+
 # link the library to the main project
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE clova-apis)
diff --git a/cmake/BuildGoogleAPIs.cmake b/cmake/BuildGoogleAPIs.cmake
@@ -77,5 +77,9 @@ endif()
 target_include_directories(google-apis PUBLIC ${OUTPUT_FOLDER} ${GRPC_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIR}
                                               ${absl_INCLUDE_DIRS})
 
+# link the grpc libraries
+target_link_libraries(google-apis PRIVATE ${GRPC_LIBRARIES})
+target_link_directories(google-apis PRIVATE ${GRPC_LIB_DIR})
+
 # link the library to the main project
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE google-apis)
diff --git a/cmake/BuildMyCurl.cmake b/cmake/BuildMyCurl.cmake
@@ -1,6 +1,6 @@
 include(FetchContent)
 
-set(LibCurl_VERSION "8.4.0-3")
+set(LibCurl_VERSION "8.4.1")
 set(LibCurl_BASEURL "https://github.com/occ-ai/obs-ai-libcurl-dep/releases/download/${LibCurl_VERSION}")
 
 if(${CMAKE_BUILD_TYPE} STREQUAL Release OR ${CMAKE_BUILD_TYPE} STREQUAL RelWithDebInfo)
@@ -12,26 +12,26 @@ endif()
 if(APPLE)
   if(LibCurl_BUILD_TYPE STREQUAL Release)
     set(LibCurl_URL "${LibCurl_BASEURL}/libcurl-macos-${LibCurl_VERSION}-Release.tar.gz")
-    set(LibCurl_HASH SHA256=5ef7bfed2c2bca17ba562aede6a3c3eb465b8d7516cff86ca0f0d0337de951e1)
+    set(LibCurl_HASH SHA256=700dc8ba476978bf8ee60c92fe31f7e1e31b7d67a47452f1d78b38ac7afd8962)
   else()
     set(LibCurl_URL "${LibCurl_BASEURL}/libcurl-macos-${LibCurl_VERSION}-Debug.tar.gz")
-    set(LibCurl_HASH SHA256=da0801168eac5103e6b27bfd0f56f82e0617f85e4e6c69f476071dbba273403b)
+    set(LibCurl_HASH SHA256=ee014693c74bb33d1851e2f136031cf4c490b7400c981a204a61cd5d3afd268a)
   endif()
 elseif(MSVC)
   if(LibCurl_BUILD_TYPE STREQUAL Release)
     set(LibCurl_URL "${LibCurl_BASEURL}/libcurl-windows-${LibCurl_VERSION}-Release.zip")
-    set(LibCurl_HASH SHA256=bf4d4cd7d741712a2913df0994258d11aabe22c9a305c9f336ed59e76f351adf)
+    set(LibCurl_HASH SHA256=7b40e4c1b80f1ade3051fb30077ff9dec6ace5cb0f46ba2ec35b35fdcafef5ff)
   else()
     set(LibCurl_URL "${LibCurl_BASEURL}/libcurl-windows-${LibCurl_VERSION}-Debug.zip")
-    set(LibCurl_HASH SHA256=9fe20e677ffb0d7dd927b978d532e23574cdb1923e2d2ca7c5e42f1fff2ec529)
+    set(LibCurl_HASH SHA256=d972ff7d473f43172f9ad8b9ad32015c4c85621b84d099d748278e0920c60a64)
   endif()
 else()
   if(LibCurl_BUILD_TYPE STREQUAL Release)
     set(LibCurl_URL "${LibCurl_BASEURL}/libcurl-linux-${LibCurl_VERSION}-Release.tar.gz")
-    set(LibCurl_HASH SHA256=f2cd80b7d3288fe5b4c90833bcbf0bde7c9574bc60eddb13015df19c5a09f56b)
+    set(LibCurl_HASH SHA256=3e4769575682b84bb916f55411eac0541c78199087e127b499f9c18c8afd7203)
   else()
     set(LibCurl_URL "${LibCurl_BASEURL}/libcurl-linux-${LibCurl_VERSION}-Debug.tar.gz")
-    set(LibCurl_HASH SHA256=6a41d3daef98acc3172b3702118dcf1cccbde923f3836ed2f4f3ed7301e47b8b)
+    set(LibCurl_HASH SHA256=fe0c1164c6b19def6867f0cbae979bb8a165e04ebb02cde6eb9b8af243a34483)
   endif()
 endif()
 

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,6 +1,7 @@
 [requires]
 grpc/1.67.1
 protobuf/5.27.0
+absl/20240116.2
 
 [generators]
 CMakeDeps