TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some updates

Browse Source
This commit is contained in:
WolverinDEV 2020-02-16 12:17:13 +01:00
parent ec1205c313
commit e243f1bd94
4 changed files with 12 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -53,7 +53,6 @@ find_package(Boringssl REQUIRED)
find_package(ThreadPool REQUIRED) find_package(ThreadPool REQUIRED)
find_package(CXXTerminal REQUIRED) find_package(CXXTerminal REQUIRED)
find_package(StringVariable REQUIRED) find_package(StringVariable REQUIRED)
find_package(mysqlclient REQUIRED)
find_package(yaml-cpp REQUIRED) find_package(yaml-cpp REQUIRED)
find_package(jsoncpp REQUIRED) find_package(jsoncpp REQUIRED)
find_package(Ed25519 REQUIRED) find_package(Ed25519 REQUIRED)
@ -81,6 +80,16 @@ macro(find_event static)
endmacro() endmacro()
find_event(TRUE) find_event(TRUE)
check_include_file(mysql/mysql.h HAVE_MYSQL_MYSQL_H)
if(HAVE_MYSQL_MYSQL_H)
add_definitions(-DHAVE_MYSQL_MYSQL_H)
endif()
check_include_file(mysql.h HAVE_MYSQL_H)
if(HAVE_MYSQL_H)
add_definitions(-DHAVE_MYSQL_H)
endif()
#FIXME: Use module for this #FIXME: Use module for this
include_directories(${breakpad_INCLUDE_DIR}) include_directories(${breakpad_INCLUDE_DIR})
include_directories(${ed25519_INCLUDE_DIR}) include_directories(${ed25519_INCLUDE_DIR})

53
cmake/Modules/Findmysqlclient.cmake
View File

@ -1,53 +0,0 @@
# - Try to find mysqlclient include dirs and libraries
#
# Usage of this module as follows:
#
# find_package(mysqlclient)
#
# Variables used by this module, they can change the default behaviour and need
# to be set before calling find_package:
#
# MYSQLCLIENT_ROOT_DIR Set this variable to the root installation of
# mysqlclient if the module has problems finding the
# proper installation path.
#
# Variables defined by this module:
#
# MYSQLCLIENT_FOUND System has mysqlclient, include and library dirs found
# MYSQLCLIENT_INCLUDE_DIR The mysqlclient include directories.
include(FindPackageHandleStandardArgs)
find_package(PkgConfig)
pkg_check_modules(PC_MYSQL_CLIENT QUIET mysqlclient)
message(${PC_MYSQL_CLIENT_INCLUDEDIR})
find_path(MYSQLCLIENT_INCLUDE_DIR
NAMES mysql.h
HINTS ${MYSQLCLIENT_ROOT_DIR} ${MYSQLCLIENT_ROOT_DIR}/include/ ${PC_MYSQL_CLIENT_INCLUDEDIR}
)
if (NOT TARGET mysqlclient::static)
find_library(MYSQLCLIENT_STATIC_LIBS
NAMES libmysqlclient.a
HINTS ${mysqlclient_ROOT_DIR} ${mysqlclient_ROOT_DIR}/lib ${PC_MYSQL_CLIENT_LIBDIR}
)
if (MYSQLCLIENT_STATIC_LIBS)
add_library(mysqlclient::static SHARED IMPORTED)
set_target_properties(mysqlclient::static PROPERTIES
IMPORTED_LOCATION ${MYSQLCLIENT_STATIC_LIBS}
INTERFACE_INCLUDE_DIRECTORIES ${MYSQLCLIENT_INCLUDE_DIR}
)
endif ()
endif ()
find_package_handle_standard_args(mysqlclient DEFAULT_MSG
MYSQLCLIENT_INCLUDE_DIR
)
mark_as_advanced(
MYSQLCLIENT_ROOT_DIR
MYSQLCLIENT_STATIC_LIBS
PC_MYSQL_CLIENT
)

2
server/CMakeLists.txt
View File

@ -276,7 +276,7 @@ target_link_libraries(TeaSpeakServer
tomcrypt::static tomcrypt::static
tommath::static tommath::static
mysqlclient::static mysqlclient.a
jsoncpp_lib jsoncpp_lib
${ed25519_LIBRARIES_STATIC} ${ed25519_LIBRARIES_STATIC}
${DataPipes_LIBRARIES_SHARED} # Also includes glib2.0 ${DataPipes_LIBRARIES_SHARED} # Also includes glib2.0

2
shared

@ -1 +1 @@
Subproject commit 71d1cc666b3135d9df0875a6f78f71cda64221e5 Subproject commit e500f8c0aa2e5b132aa3427aaaf0311b9d49036a