always link against CURL even with system (#155)

heroiclabs · Jan 31, 2024 · 719b2f5 · 719b2f5
1 parent 98cce48
commit 719b2f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/impl/httpCurl/CMakeLists.txt b/impl/httpCurl/CMakeLists.txt
@@ -9,14 +9,11 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 add_library(nakama-impl-http-libcurl OBJECT ${srcs})
 
-if (NOT BUILD_CURL_HTTP_SYSTEM)
-    find_package(CURL CONFIG REQUIRED)
-
-    target_link_libraries(nakama-impl-http-libcurl
-        PUBLIC CURL::libcurl
-    )
-endif()
+find_package(CURL CONFIG REQUIRED)
 
+target_link_libraries(nakama-impl-http-libcurl
+    PUBLIC CURL::libcurl
+)
 
 target_link_libraries(nakama-impl-http-libcurl
     PUBLIC nakama-api-proto nakama::sdk-interface

diff --git a/impl/wsWslay/CMakeLists.txt b/impl/wsWslay/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(nakama-impl-ws-wslay INTERFACE
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 
-if (BUILD_CURL_IO AND NOT BUILD_CURL_IO_SYSTEM)
+if (BUILD_CURL_IO OR BUILD_CURL_IO_SYSTEM)
     find_package(CURL CONFIG REQUIRED)
     target_link_libraries(nakama-impl-ws-wslay PRIVATE CURL::libcurl)
 endif()