From 3141a4566d480edcb04c2427e3cc5a876475de40 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Fri, 24 Jan 2020 15:42:32 +0100 Subject: [PATCH] Its compiling --- license/CMakeLists.txt | 17 +++++++++++++++++ server/CMakeLists.txt | 10 ++++++++++ shared | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/license/CMakeLists.txt b/license/CMakeLists.txt index 61c6210..99a38dd 100644 --- a/license/CMakeLists.txt +++ b/license/CMakeLists.txt @@ -26,8 +26,25 @@ include_directories(${Protobuf_INCLUDE_DIRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS packets/LicenseRequest.proto packets/LicenseManager.proto) +#FIXME: Use modules for this! +find_package(Ed25519 REQUIRED) +include_directories(${ed25519_INCLUDE_DIR}) + +find_package(ThreadPool REQUIRED) +include_directories(${ThreadPool_INCLUDE_DIR}) + +find_package(DataPipes REQUIRED) +include_directories(${DataPipes_INCLUDE_DIR}) + +find_package(Libevent REQUIRED) +include_directories(${LIBEVENT_INCLUDE_DIRS}) + +find_package(StringVariable REQUIRED) +include_directories(${StringVariable_INCLUDE_DIR}) + #The actual librarie add_library(TeaLicenseHelper STATIC ${LICENCE_SOURCE_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) +target_link_libraries(TeaLicenseHelper PUBLIC TeaSpeak) #The license server diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 06451fe..e3af485 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -14,6 +14,16 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/environment/) #disable for debug #add_definitions(-DRELEASE_MODE) +#FIXME! +find_package(DataPipes REQUIRED) +include_directories(${DataPipes_INCLUDE_DIR}) + +find_package(StringVariable REQUIRED) +include_directories(${StringVariable_INCLUDE_DIR}) + +find_package(Ed25519 REQUIRED) +include_directories(${ed25519_INCLUDE_DIR}) + include_directories(../music/include/) include_directories(../shared/src) include_directories(../license/src) diff --git a/shared b/shared index 73f292f..84f3259 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 73f292f9517c82260a5d1b6e3beee3cfcf0a6f5f +Subproject commit 84f3259b5e5a56b6097009e11b81ebc1c00b9cfd