Make stuff work

This commit is contained in:
WolverinDEV
2020-01-24 17:06:52 +01:00
parent c3a654efe9
commit b099578957
4 changed files with 9 additions and 5 deletions
+6 -2
View File
@@ -55,8 +55,6 @@ find_package(CXXTerminal REQUIRED)
find_package(StringVariable REQUIRED)
find_package(yaml-cpp REQUIRED)
set(LIBEVENT_STATIC_LINK TRUE)
find_package(Libevent REQUIRED)
find_package(jsoncpp REQUIRED)
find_package(Ed25519 REQUIRED)
find_package(DataPipes REQUIRED)
@@ -65,6 +63,12 @@ find_package(spdlog REQUIRED)
find_package(Jemalloc REQUIRED)
find_package(Protobuf REQUIRED)
# LibEvent fucks up the CMAKE_FIND_LIBRARY_SUFFIXES variable
function(find_event)
set(LIBEVENT_STATIC_LINK TRUE)
find_package(Libevent REQUIRED)
endfunction()
find_event()
#FIXME: Use module for this
include_directories(${ed25519_INCLUDE_DIR})
+1 -1
Submodule music updated: a0a2a454d3...6bdb628586
+1 -1
View File
@@ -256,7 +256,7 @@ target_link_libraries(TeaSpeakServer
${YAML_CPP_LIBRARIES}
pthread
stdc++fs
event_static event_pthreads
libevent::core libevent::pthreads
opus::static
yaml-cpp
${LIBRARY_PATH_PROTOBUF}
+1 -1
Submodule shared updated: 239c6e69f9...deeba1b73e