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

More simplification of cmakelists

Browse source
This commit is contained in:
Mordred 2017-09-12 19:38:17 +02:00
parent f98148dd3a
commit 309da788e3
7 changed files with 23 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -54,6 +54,7 @@ cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
*.cbp
# Binary Template
*.bt

21
CMakeLists.txt
View file

@ -19,10 +19,25 @@ endif()
set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
set(SERVER_COMMON_DIR ${CMAKE_SOURCE_DIR}/src/servers/Server_Common)
include( "cmake/boost.cmake" )
include( "cmake/compiler.cmake" )
if(UNIX)
include_directories("/usr/include/mysql/")
else()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQL/")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
# 32 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQL/x86)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/zlib/x86)
else()
# 64 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/MySQL/x64)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/zlib/x64)
endif()
endif()
if( NOT $MYSQLCONNECTORCPP_ROOT_DIR )
set( MYSQLCONNECTORCPP_ROOT_DIR "G:\\programming\\libs\\MySQL1.1.9" )
endif()
@ -32,9 +47,11 @@ FIND_PACKAGE(MySQLConnectorCPP)
if( MYSQLCONNECTORCPP_FOUND )
message( "Found Mysql C++ Connector at ${MYSQLCONNECTORCPP_INCLUDE_DIR}" )
else()
message( FATAL_ERROR "You are missing the Mysql C++ Connector 1.1" )
message( FATAL_ERROR "Missing Mysql C++ Connector 1.1" )
endif()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/ChaiScript-6.0.0/include/")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/sapphire/datReader/")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src")

6
cmake/boost.cmake
View file

@ -14,10 +14,10 @@ if(UNIX)
endif()
else()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../external/${SAPPHIRE_BOOST_FOLDER_NAME})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
message(STATUS "Using boost in /libraries/external")
set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../external/${SAPPHIRE_BOOST_FOLDER_NAME})
set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../../external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
else()
find_package(Boost ${SAPPHIRE_BOOST_VER} COMPONENTS system)
if(Boost_FOUND)

8
src/servers/Server_Common/CMakeLists.txt
View file

@ -1,14 +1,6 @@
cmake_minimum_required(VERSION 2.6)
project(Sapphire)
if(UNIX)
include_directories("/usr/include/mysql/")
else()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
message(STATUS "Using boost in /libraries/external")
endif()
file(GLOB UTILS_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
file(GLOB UTILS_SOURCE_FILES
"${CMAKE_CURRENT_SOURCE_DIR}*.cpp"

16
src/servers/Server_Lobby/CMakeLists.txt
View file

@ -5,22 +5,6 @@ project(Sapphire)
file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
if(UNIX)
include_directories("/usr/include/mysql/")
else()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
# 32 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
else()
# 64 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})

16
src/servers/Server_REST/CMakeLists.txt
View file

@ -6,22 +6,6 @@ file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
if(UNIX)
include_directories("/usr/include/mysql/")
else()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
# 32 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
else()
# 64 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
add_dependencies(server_rest Common xivdat)

15
src/servers/Server_Zone/CMakeLists.txt
View file

@ -20,21 +20,6 @@ file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
StatusEffect/*.c*
Zone/*.c*)
if(UNIX)
include_directories("/usr/include/mysql/")
else()
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
# 32 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86)
else()
# 64 bit link
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64)
link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64)
endif()
endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")
add_executable(server_zone ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )