mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 20:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Need to link against crypto for new version of libmicrohttpd when gnutls is disabled.

Browse Source
This commit is contained in:
casey langen 2019-01-25 10:11:41 -08:00
parent 8a3b9d97a3
commit c0df72bd82
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/server/CMakeLists.txt
View File

@ -26,8 +26,6 @@ if (${LINK_STATICALLY} MATCHES "true")
# libmicrohttpd on macOS now depends on `gnutls`. when we build statically,
# we also need to build libmicrohttpd ourselves and disable TLS to avoid this
# homebrew-only dependency
set(EXTRA_OBJS "")
set(MICROHTTPDLIB "")
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
include (ExternalProject)
@ -42,10 +40,11 @@ if (${LINK_STATICALLY} MATCHES "true")
add_dependencies(server libmicrohttpd)
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/microhttpd/include")
file(GLOB EXTRA_OBJS "${CMAKE_CURRENT_SOURCE_DIR}/libmicrohttpd-prefix/src/libmicrohttpd/src/microhttpd/.libs/*.o")
target_link_libraries(server ${server_LINK_LIBS} z crypto ${EXTRA_OBJS})
else()
find_library(MICROHTTPDLIB NAMES libmicrohttpd.a microhttpd)
target_link_libraries(server ${server_LINK_LIBS} ${MICROHTTPDLIB} z)
endif()
target_link_libraries(server ${server_LINK_LIBS} ${MICROHTTPDLIB} z ${EXTRA_OBJS})
else()
set(EXTRA_LIBS "")
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")