mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

Another build fix attempt

Browse source
This commit is contained in:
Mordred 2018-09-22 15:04:18 +02:00
parent edff024004
commit d4cb28f99f
2 changed files with 52 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/servers/sapphire_lobby/CMakeLists.txt
View file

@ -1,13 +1,14 @@
cmake_minimum_required( VERSION 2.6 )
cmake_policy( SET CMP0015 NEW )
project( Sapphire )
cmake_minimum_required(VERSION 3.0.2)
cmake_policy(SET CMP0015 NEW)
project(Sapphire)
file( GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*" )
file( GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.cpp" )
file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
add_executable( sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES} )
set_target_properties( sapphire_lobby PROPERTIES
add_executable(sapphire_lobby ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
set_target_properties(sapphire_lobby PROPERTIES
CXX_STANDARD 14
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS ON
@ -16,7 +17,13 @@ set_target_properties( sapphire_lobby PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
)
)
target_link_libraries( sapphire_lobby common )
if (UNIX)
target_link_libraries(sapphire_lobby common pthread dl z)
else()
target_link_libraries(sapphire_lobby common zlib1)
endif()
target_link_libraries(sapphire_lobby ${Boost_LIBRARIES} ${Boost_LIBRARIES})
cotire( sapphire_lobby )

23
src/servers/sapphire_zone/CMakeLists.txt
View file

@ -1,10 +1,10 @@
cmake_minimum_required( VERSION 3.0.2 )
cmake_policy( SET CMP0015 NEW )
cmake_policy( SET CMP0014 OLD )
cmake_minimum_required(VERSION 3.0.2)
cmake_policy(SET CMP0015 NEW)
cmake_policy(SET CMP0014 OLD)
project( sapphire_zone )
project(sapphire_zone)
file( GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
file(GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
*.c*
Actor/*.c*
Action/*.c*
@ -22,7 +22,7 @@ file( GLOB SERVER_SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
add_executable( sapphire_zone ${SERVER_SOURCE_FILES} )
set_target_properties( sapphire_zone PROPERTIES
set_target_properties(sapphire_zone PROPERTIES
CXX_STANDARD 14
CXX_STANDARD_REQUIRED ON
CXX_EXTENSIONS ON
@ -33,12 +33,19 @@ set_target_properties( sapphire_zone PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/"
)
)
target_link_libraries( sapphire_zone common )
target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
if (UNIX)
target_link_libraries( sapphire_zone pthread )
target_link_libraries( sapphire_zone dl )
target_link_libraries( sapphire_zone z )
else()
target_link_libraries( sapphire_zone zlib1 )
endif()
target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
if (UNIX)