From 5e66ec80b33451ee9949e308f5ecf8637613af90 Mon Sep 17 00:00:00 2001
From: Pierrick HYMBERT <pierrick.hymbert@gmail.com>
Date: Sun, 17 Mar 2024 02:07:06 +0100
Subject: [PATCH] common: fix windows tests

---
 .github/workflows/server.yml | 4 +++-
 common/CMakeLists.txt        | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index bb321aa1c..92268fe9d 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -117,7 +117,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DLLAMA_CURL=ON -DCURL_LIBRARY="$env:RUNNER_TEMP/libcurl/lib" -DCURL_INCLUDE_DIR="$env:RUNNER_TEMP/libcurl/include" -DLLAMA_BUILD_SERVER=ON -DLLAMA_NATIVE=OFF -DBUILD_SHARED_LIBS=ON
+          cmake .. -DLLAMA_CURL=ON -DCURL_LIBRARY="$env:RUNNER_TEMP/libcurl/lib/libcurl.dll.a" -DCURL_INCLUDE_DIR="$env:RUNNER_TEMP/libcurl/include" -DLLAMA_BUILD_SERVER=ON -DLLAMA_NATIVE=OFF -DBUILD_SHARED_LIBS=ON
           cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS} --target server
 
       - name: Python setup
@@ -136,6 +136,7 @@ jobs:
         if: ${{ !matrix.disabled_on_pr || !github.event.pull_request }}
         run: |
           cd examples/server/tests
+          $env:PATH += ";$env:RUNNER_TEMP/libcurl/bin"
           behave.exe --summary --stop --no-capture --exclude 'issues|wrong_usages|passkey' --tags llama.cpp
 
       - name: Slow tests
@@ -143,4 +144,5 @@ jobs:
         if: ${{ (github.event.schedule || github.event.inputs.slow_tests == 'true') && matrix.build_type == 'Release' }}
         run: |
           cd examples/server/tests
+          $env:PATH += ";$env:RUNNER_TEMP/libcurl/bin"
           behave.exe --stop --no-skipped --no-capture --tags slow
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index cb4e53869..af2629a46 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -68,14 +68,17 @@ if (BUILD_SHARED_LIBS)
     set_target_properties(${TARGET} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 endif()
 
+set(LLAMA_COMMON_EXTRA_LIBS build_info)
+
 # Use curl to download model url
 if (LLAMA_CURL)
-    find_package(CURL)
+    find_package(CURL REQUIRED)
     add_definitions(-DLLAMA_USE_CURL)
     include_directories(${CURL_INCLUDE_DIRS})
-    target_link_libraries(${TARGET} PRIVATE curl)
+    find_library(CURL_LIBRARY curl REQUIRED)
+    set(LLAMA_COMMON_EXTRA_LIBS ${LLAMA_COMMON_EXTRA_LIBS} ${CURL_LIBRARY})
 endif ()
 
 target_include_directories(${TARGET} PUBLIC .)
 target_compile_features(${TARGET} PUBLIC cxx_std_11)
-target_link_libraries(${TARGET} PRIVATE build_info PUBLIC llama)
+target_link_libraries(${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama)