Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

always link against CURL even with BUILD_CURL_SYSTEM defined. #155

Merged
merged 1 commit into from
Jan 31, 2024
Merged

always link against CURL even with BUILD_CURL_SYSTEM defined. #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions impl/httpCurl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion impl/wsWslay/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading