From 5cace54457dfde94543218821261e6e1e71d06eb Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Tue, 2 Jul 2019 02:02:50 +0200 Subject: [PATCH] Some fixes --- CMakeLists.txt | 71 +++++++++++++++++++++------------------------ src/misc/base64.cpp | 4 +++ 2 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 src/misc/base64.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index b64b0b7..036ed2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +#X cmake_minimum_required(VERSION 3.6) project(TeaSpeak-Shared) set(CMAKE_CXX_STANDARD 17) @@ -7,11 +8,10 @@ if(NOT WIN32) set(CMAKE_INCLUDE_CURRENT_DIR ON) endif() -if(CMAKE_PLATFORM_INCLUDE AND NOT CMAKE_PLATFORM_INCLUDE STREQUAL "") - include(${CMAKE_PLATFORM_INCLUDE}) -endif() - if(NOT TEASPEAK_SERVER) + set(CMAKE_MODULE_PATH "C:/Users/WolverinDEV/TeaSpeak/cmake") + include(${CMAKE_MODULE_PATH}/libraries_wolverin_lap.cmake) + find_package(TomMath REQUIRED) include_directories(${TomMath_INCLUDE_DIR}) @@ -22,21 +22,20 @@ if(NOT TEASPEAK_SERVER) include_directories(${DataPipes_INCLUDE_DIR}) message("Include: ${DataPipes_INCLUDE_DIR}") - find_package(Libevent REQUIRED) + find_package(LibEvent REQUIRED) include_directories(${LIBEVENT_INCLUDE_DIRS}) find_package(StringVariable REQUIRED) include_directories(${StringVariable_INCLUDE_DIR}) - find_package(Ed25519 REQUIRED) + find_package(ed25519 REQUIRED) include_directories(${ed25519_INCLUDE_DIR}) find_package(ThreadPool REQUIRED) include_directories(${ThreadPool_INCLUDE_DIR}) - if(WIN32) - add_definitions(-DWINDOWS) #Required for ThreadPool - endif() - find_package(spdlog CONFIG REQUIRED) + add_definitions(-DWINDOWS) #Required for ThreadPool + + find_package(SpdLog CONFIG REQUIRED) link_libraries(spdlog::spdlog) #Its a header only lib so we should be fine :) add_definitions(-DNO_OPEN_SSL) @@ -71,6 +70,7 @@ set(SOURCE_FILES src/misc/rnd.cpp src/misc/time.cpp src/misc/memtracker.cpp + src/misc/base64.cpp #Logger src/log/LogUtils.cpp @@ -164,9 +164,8 @@ if(HAVE_OPEN_SSL) endif() if (NOT WIN32) - #TODO: Do we really need that anymroe? set(SOURCE_FILES ${SOURCE_FILES} - #src/misc/TraceUtils.cpp + src/misc/TraceUtils.cpp ) set(HEADER_FILES ${HEADER_FILES} @@ -199,38 +198,34 @@ set(TEST_LIBRARIES include_directories(src/) -option(BUILD_TESTS "Enable/disable test building" ON) -if(BUILD_TESTS) - add_executable(RingTest test/RingTest.cpp ${SOURCE_FILES}) - target_link_libraries(RingTest ${TEST_LIBRARIES}) +add_executable(RingTest test/RingTest.cpp ${SOURCE_FILES}) +target_link_libraries(RingTest ${TEST_LIBRARIES}) +if(NOT WIN32) + add_executable(CommandTest ${SOURCE_FILES} ${HEADER_FILES} test/CommandTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) + target_link_libraries(CommandTest ${TEST_LIBRARIES}) - if(NOT WIN32) - add_executable(CommandTest ${SOURCE_FILES} ${HEADER_FILES} test/CommandTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) - target_link_libraries(CommandTest ${TEST_LIBRARIES}) + add_executable(WebsocketTest ${SOURCE_FILES} ${HEADER_FILES} test/WSSTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) + target_link_libraries(WebsocketTest ${TEST_LIBRARIES}) - add_executable(WebsocketTest ${SOURCE_FILES} ${HEADER_FILES} test/WSSTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) - target_link_libraries(WebsocketTest ${TEST_LIBRARIES}) + add_executable(SQLTest ${SOURCE_FILES} ${HEADER_FILES} test/SQLTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) + target_link_libraries(SQLTest ${TEST_LIBRARIES}) - add_executable(SQLTest ${SOURCE_FILES} ${HEADER_FILES} test/SQLTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) - target_link_libraries(SQLTest ${TEST_LIBRARIES}) + add_executable(ChannelTest ${SOURCE_FILES} ${HEADER_FILES} test/ChannelTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) + target_link_libraries(ChannelTest ${TEST_LIBRARIES}) - add_executable(ChannelTest ${SOURCE_FILES} ${HEADER_FILES} test/ChannelTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) - target_link_libraries(ChannelTest ${TEST_LIBRARIES}) + add_executable(EndianessTest ${SOURCE_FILES} ${HEADER_FILES} test/EndianessTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) + target_link_libraries(EndianessTest ${TEST_LIBRARIES}) - add_executable(EndianessTest ${SOURCE_FILES} ${HEADER_FILES} test/EndianessTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h) - target_link_libraries(EndianessTest ${TEST_LIBRARIES}) + include_directories(/usr/local/include/breakpad) + add_executable(CrashTest test/CrashTest.cpp ${SOURCE_FILES}) + target_link_libraries(CrashTest ${TEST_LIBRARIES}) - include_directories(/usr/local/include/breakpad) - add_executable(CrashTest test/CrashTest.cpp ${SOURCE_FILES}) - target_link_libraries(CrashTest ${TEST_LIBRARIES}) + add_executable(PorpertyTest test/PropertyTest.cpp ${SOURCE_FILES}) + target_link_libraries(PorpertyTest ${TEST_LIBRARIES}) - add_executable(PorpertyTest test/PropertyTest.cpp ${SOURCE_FILES}) - target_link_libraries(PorpertyTest ${TEST_LIBRARIES}) + add_executable(BBTest test/BBTest.cpp ${SOURCE_FILES}) + target_link_libraries(BBTest ${TEST_LIBRARIES}) - add_executable(BBTest test/BBTest.cpp ${SOURCE_FILES}) - target_link_libraries(BBTest ${TEST_LIBRARIES}) - - add_executable(LinkedTest test/LinkedTest.cpp ${SOURCE_FILES}) - target_link_libraries(LinkedTest ${TEST_LIBRARIES}) - endif() + add_executable(LinkedTest test/LinkedTest.cpp ${SOURCE_FILES}) + target_link_libraries(LinkedTest ${TEST_LIBRARIES}) endif() diff --git a/src/misc/base64.cpp b/src/misc/base64.cpp new file mode 100644 index 0000000..d70e954 --- /dev/null +++ b/src/misc/base64.cpp @@ -0,0 +1,4 @@ +// +// Created by wolverindev on 02.07.19. +// +