Fixed linux client builds
This commit is contained in:
parent
d75455c63f
commit
e55a2b8ea4
|
@ -1,4 +1,3 @@
|
||||||
#X
|
|
||||||
cmake_minimum_required(VERSION 3.6)
|
cmake_minimum_required(VERSION 3.6)
|
||||||
project(TeaSpeak-Shared)
|
project(TeaSpeak-Shared)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
@ -8,10 +7,11 @@ if(NOT WIN32)
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT TEASPEAK_SERVER)
|
if(CMAKE_PLATFORM_INCLUDE AND NOT CMAKE_PLATFORM_INCLUDE STREQUAL "")
|
||||||
set(CMAKE_MODULE_PATH "C:/Users/WolverinDEV/TeaSpeak/cmake")
|
include(${CMAKE_PLATFORM_INCLUDE})
|
||||||
include(${CMAKE_MODULE_PATH}/libraries_wolverin_lap.cmake)
|
endif()
|
||||||
|
|
||||||
|
if(NOT TEASPEAK_SERVER)
|
||||||
find_package(TomMath REQUIRED)
|
find_package(TomMath REQUIRED)
|
||||||
include_directories(${TomMath_INCLUDE_DIR})
|
include_directories(${TomMath_INCLUDE_DIR})
|
||||||
|
|
||||||
|
@ -22,20 +22,21 @@ if(NOT TEASPEAK_SERVER)
|
||||||
include_directories(${DataPipes_INCLUDE_DIR})
|
include_directories(${DataPipes_INCLUDE_DIR})
|
||||||
message("Include: ${DataPipes_INCLUDE_DIR}")
|
message("Include: ${DataPipes_INCLUDE_DIR}")
|
||||||
|
|
||||||
find_package(LibEvent REQUIRED)
|
find_package(Libevent REQUIRED)
|
||||||
include_directories(${LIBEVENT_INCLUDE_DIRS})
|
include_directories(${LIBEVENT_INCLUDE_DIRS})
|
||||||
|
|
||||||
find_package(StringVariable REQUIRED)
|
find_package(StringVariable REQUIRED)
|
||||||
include_directories(${StringVariable_INCLUDE_DIR})
|
include_directories(${StringVariable_INCLUDE_DIR})
|
||||||
|
|
||||||
find_package(ed25519 REQUIRED)
|
find_package(Ed25519 REQUIRED)
|
||||||
include_directories(${ed25519_INCLUDE_DIR})
|
include_directories(${ed25519_INCLUDE_DIR})
|
||||||
|
|
||||||
find_package(ThreadPool REQUIRED)
|
find_package(ThreadPool REQUIRED)
|
||||||
include_directories(${ThreadPool_INCLUDE_DIR})
|
include_directories(${ThreadPool_INCLUDE_DIR})
|
||||||
|
if(WIN32)
|
||||||
add_definitions(-DWINDOWS) #Required for ThreadPool
|
add_definitions(-DWINDOWS) #Required for ThreadPool
|
||||||
|
endif()
|
||||||
find_package(SpdLog CONFIG REQUIRED)
|
find_package(spdlog CONFIG REQUIRED)
|
||||||
link_libraries(spdlog::spdlog) #Its a header only lib so we should be fine :)
|
link_libraries(spdlog::spdlog) #Its a header only lib so we should be fine :)
|
||||||
|
|
||||||
add_definitions(-DNO_OPEN_SSL)
|
add_definitions(-DNO_OPEN_SSL)
|
||||||
|
@ -163,8 +164,9 @@ if(HAVE_OPEN_SSL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT WIN32)
|
if (NOT WIN32)
|
||||||
|
#TODO: Do we really need that anymroe?
|
||||||
set(SOURCE_FILES ${SOURCE_FILES}
|
set(SOURCE_FILES ${SOURCE_FILES}
|
||||||
src/misc/TraceUtils.cpp
|
#src/misc/TraceUtils.cpp
|
||||||
)
|
)
|
||||||
set(HEADER_FILES ${HEADER_FILES}
|
set(HEADER_FILES ${HEADER_FILES}
|
||||||
|
|
||||||
|
@ -197,9 +199,12 @@ set(TEST_LIBRARIES
|
||||||
|
|
||||||
include_directories(src/)
|
include_directories(src/)
|
||||||
|
|
||||||
add_executable(RingTest test/RingTest.cpp ${SOURCE_FILES})
|
option(BUILD_TESTS "Enable/disable test building" ON)
|
||||||
target_link_libraries(RingTest ${TEST_LIBRARIES})
|
if(BUILD_TESTS)
|
||||||
if(NOT WIN32)
|
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)
|
add_executable(CommandTest ${SOURCE_FILES} ${HEADER_FILES} test/CommandTest.cpp src/log/LogSinks.cpp src/log/LogSinks.h)
|
||||||
target_link_libraries(CommandTest ${TEST_LIBRARIES})
|
target_link_libraries(CommandTest ${TEST_LIBRARIES})
|
||||||
|
|
||||||
|
@ -227,4 +232,5 @@ if(NOT WIN32)
|
||||||
|
|
||||||
add_executable(LinkedTest test/LinkedTest.cpp ${SOURCE_FILES})
|
add_executable(LinkedTest test/LinkedTest.cpp ${SOURCE_FILES})
|
||||||
target_link_libraries(LinkedTest ${TEST_LIBRARIES})
|
target_link_libraries(LinkedTest ${TEST_LIBRARIES})
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Reference in New Issue