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/datReader" )
add_subdirectory( "deps/mysqlConnector" )
add_subdirectory( "src/common" )
##############################
# Main Sapphire Components #
##############################
add_subdirectory( "src/common" )
add_subdirectory( "src/api" )
add_subdirectory( "src/lobby" )
add_subdirectory( "src/world" )
add_subdirectory( "src/dbm" )
add_subdirectory( "src/scripts" )
add_subdirectory( "src/dbm" )
##############################
# 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} )
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} )
set_target_properties( common PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../bin/"
)
target_link_libraries( common PUBLIC xivdat )
target_link_libraries( common PUBLIC mysqlConnector )
target_link_libraries( common
PUBLIC
xivdat
mysqlConnector
mysql )
if( UNIX )
target_link_libraries( common PUBLIC mysqlclient )
target_link_libraries( common PUBLIC pthread )
else()
target_link_libraries( common
PUBLIC
mysql )
pthread
stdc++fs )
endif()
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
PRIVATE
common
mysql )
if( UNIX )
target_link_libraries( lobby
PRIVATE
stdc++fs )
endif()
common )
#cotire( lobby )

7
src/world/CMakeLists.txt
View file

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