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

Further cmake cleanup

Browse source
This commit is contained in:
mordred 2019-01-02 11:23:39 +01:00
parent 38d6f73951
commit e7507515b6
5 changed files with 12 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -39,17 +39,16 @@ add_subdirectory( "deps/zlib" )
add_subdirectory( "deps/MySQL" ) add_subdirectory( "deps/MySQL" )
add_subdirectory( "deps/datReader" ) add_subdirectory( "deps/datReader" )
add_subdirectory( "deps/mysqlConnector" ) add_subdirectory( "deps/mysqlConnector" )
add_subdirectory( "src/common" )
############################## ##############################
# Main Sapphire Components # # Main Sapphire Components #
############################## ##############################
add_subdirectory( "src/common" )
add_subdirectory( "src/api" ) add_subdirectory( "src/api" )
add_subdirectory( "src/lobby" ) add_subdirectory( "src/lobby" )
add_subdirectory( "src/world" ) add_subdirectory( "src/world" )
add_subdirectory( "src/dbm" )
add_subdirectory( "src/scripts" ) add_subdirectory( "src/scripts" )
add_subdirectory( "src/dbm" )
############################## ##############################
# Tools # # Tools #

6
src/api/CMakeLists.txt
View file

@ -8,9 +8,3 @@ file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*" )
add_executable( api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} ) add_executable( api ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
target_link_libraries( api common ) target_link_libraries( api common )
if( UNIX )
target_link_libraries( api mysqlclient stdc++fs )
else()
target_link_libraries( api mysql )
endif()

23
src/common/CMakeLists.txt
View file

@ -17,25 +17,16 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} ) add_library( common ${UTILS_PUBLIC_INCLUDE_FILES} ${UTILS_SOURCE_FILES} )
set_target_properties( common PROPERTIES target_link_libraries( common
RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" PUBLIC
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" xivdat
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" mysqlConnector
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/" mysql )
)
target_link_libraries( common PUBLIC xivdat )
target_link_libraries( common PUBLIC mysqlConnector )
if( UNIX ) if( UNIX )
target_link_libraries( common PUBLIC mysqlclient )
target_link_libraries( common PUBLIC pthread )
else()
target_link_libraries( common target_link_libraries( common
PUBLIC PUBLIC
mysql ) pthread
stdc++fs )
endif() endif()
target_include_directories( common target_include_directories( common

10
src/lobby/CMakeLists.txt
View file

@ -10,13 +10,5 @@ add_executable( lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
target_link_libraries( lobby target_link_libraries( lobby
PRIVATE PRIVATE
common common )
mysql )
if( UNIX )
target_link_libraries( lobby
PRIVATE
stdc++fs )
endif()
#cotire( lobby ) #cotire( lobby )

7
src/world/CMakeLists.txt
View file

@ -26,9 +26,7 @@ add_executable( world ${SERVER_SOURCE_FILES} )
set_target_properties( world set_target_properties( world
PROPERTIES PROPERTIES
ENABLE_EXPORTS ON ENABLE_EXPORTS ON
WINDOWS_EXPORT_ALL_SYMBOLS ON WINDOWS_EXPORT_ALL_SYMBOLS ON )
)
target_link_libraries( world target_link_libraries( world
PUBLIC PUBLIC
@ -40,7 +38,4 @@ target_include_directories( world
if( UNIX ) if( UNIX )
cotire( world ) cotire( world )
target_link_libraries( world PUBLIC stdc++fs )
else()
target_link_libraries( world PUBLIC mysql )
endif() endif()