mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-30 05:07:46 +00:00
Code Activity

Linux buildfix... hopefully

Browse source
This commit is contained in:
Mordred Admin 2018-06-06 08:32:01 +02:00
parent 447fdbbbc8
commit 750074be70
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -27,7 +27,7 @@ set( LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries" )
##########################################################################
# Dependencies and compiler settings
include( "cmake/boost.cmake" )
#include( "cmake/boost.cmake" )
#include( "cmake/mysql.cmake" )
include( "cmake/compiler.cmake" )
include( "cmake/cotire.cmake" )

10
src/common/CMakeLists.txt
View file

@ -9,6 +9,12 @@ set( MYSQLCONNECTOR_ROOT ${CMAKE_BINARY_DIR}/external/MysqlConnector )
set( MYSQLCONNECTOR_LIB_DIR ${MYSQLCONNECTOR_ROOT}/bin/lib )
set( MYSQLCONNECTOR_INCLUDE_DIR ${MYSQLCONNECTOR_ROOT}/bin/include )
if( UNIX )
set( BUILD_EXEC make )
else()
set( BUILD_EXEC nmake )
endif()
ExternalProject_Add( mysqlConnector_external
PREFIX ${MYSQLCONNECTOR_ROOT}
GIT_REPOSITORY "https://github.com/SapphireMordred/MysqlConnector.git"
@ -17,7 +23,7 @@ ExternalProject_Add( mysqlConnector_external
BINARY_DIR ${MYSQLCONNECTOR_ROOT}/src/MysqlConnector
SOURCE_DIR ${MYSQLCONNECTOR_ROOT}/src/MysqlConnector
INSTALL_DIR ${MYSQLCONNECTOR_ROOT}/bin
BUILD_COMMAND nmake )
BUILD_COMMAND ${BUILD_EXEC} )
add_library( mysqlConnector STATIC IMPORTED )
set_target_properties( mysqlConnector PROPERTIES IMPORTED_LOCATION ${MYSQLCONNECTOR_LIB_DIR}/mysqlConnector.a )
@ -37,7 +43,7 @@ ExternalProject_Add( xivdat_external
BINARY_DIR ${XIVDAT_ROOT}/src/XivDat
SOURCE_DIR ${XIVDAT_ROOT}/src/XivDat
INSTALL_DIR ${XIVDAT_ROOT}/bin
BUILD_COMMAND nmake )
BUILD_COMMAND ${BUILD_EXEC} )
add_library( xivdat STATIC IMPORTED )
set_target_properties( xivdat PROPERTIES IMPORTED_LOCATION ${XIVDAT_LIB_DIR}/xivdat.a )