From d03683a23c80835e42b0106945ab70851aa88bff Mon Sep 17 00:00:00 2001 From: Matt Raykowski Date: Mon, 21 Jun 2010 07:26:20 -0500 Subject: [PATCH] Changed: #842 Added PDS, SBS, SUS and TS to CMake build. --- code/ryzom/server/src/CMakeLists.txt | 10 ++++---- .../src/pd_support_service/CMakeLists.txt | 2 +- .../persistant_data_service/CMakeLists.txt | 22 ++++++++++++++++ .../src/session_browser_server/CMakeLists.txt | 25 +++++++++++++++++++ .../src/shard_unifier_service/CMakeLists.txt | 25 +++++++++++++++++++ .../server/src/tick_service/CMakeLists.txt | 22 ++++++++++++++++ 6 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 code/ryzom/server/src/persistant_data_service/CMakeLists.txt create mode 100644 code/ryzom/server/src/session_browser_server/CMakeLists.txt create mode 100644 code/ryzom/server/src/shard_unifier_service/CMakeLists.txt create mode 100644 code/ryzom/server/src/tick_service/CMakeLists.txt diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt index 318de3ac4..d0c789328 100644 --- a/code/ryzom/server/src/CMakeLists.txt +++ b/code/ryzom/server/src/CMakeLists.txt @@ -23,6 +23,10 @@ ADD_SUBDIRECTORY(mirror_service) ADD_SUBDIRECTORY(monitor_service) ADD_SUBDIRECTORY(pd_reference_builder) ADD_SUBDIRECTORY(pd_support_service) +ADD_SUBDIRECTORY(persistant_data_service) +ADD_SUBDIRECTORY(session_browser_server) +ADD_SUBDIRECTORY(shard_unifier_service) +ADD_SUBDIRECTORY(tick_service) # Deprecated, no longer used. #ADD_SUBDIRECTORY(ags_test) @@ -31,11 +35,7 @@ ADD_SUBDIRECTORY(pd_support_service) #ADD_SUBDIRECTORY(general_utilities_service) #ADD_SUBDIRECTORY(patchman_service) -#persistant_data_service +# Not sure, no longer used maybe? #sabrina -#server_share -#session_browser_server -#shard_unifier_service #simulation_service #testing_tool_service -#tick_service diff --git a/code/ryzom/server/src/pd_support_service/CMakeLists.txt b/code/ryzom/server/src/pd_support_service/CMakeLists.txt index c70b0046f..2a2f371fc 100644 --- a/code/ryzom/server/src/pd_support_service/CMakeLists.txt +++ b/code/ryzom/server/src/pd_support_service/CMakeLists.txt @@ -11,7 +11,7 @@ TARGET_LINK_LIBRARIES(pd_support_service admin_modules ${NELMISC_LIBRARY} ${NELNET_LIBRARY}) IF(WIN32) - SET_TARGET_PROPERTIES(ryzom_welcome_service PROPERTIES + SET_TARGET_PROPERTIES(pd_support_service PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" PROJECT_LABEL "Services: PD Support Service (PDSS)") ENDIF(WIN32) diff --git a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt new file mode 100644 index 000000000..bb526d1ce --- /dev/null +++ b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt @@ -0,0 +1,22 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(persistant_data_service ${SRC}) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(persistant_data_service admin_modules + ryzom_gameshare + pd_lib + ${PLATFORM_LINKFLAGS} + ${LIBXML2_LIBRARIES} + ${NELMISC_LIBRARY} + ${NELNET_LIBRARY}) +IF(WIN32) + SET_TARGET_PROPERTIES(persistant_data_service PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + PROJECT_LABEL "Services: Persistent Data Service (PDS)") +ENDIF(WIN32) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS persistant_data_service RUNTIME DESTINATION sbin COMPONENT services) + + diff --git a/code/ryzom/server/src/session_browser_server/CMakeLists.txt b/code/ryzom/server/src/session_browser_server/CMakeLists.txt new file mode 100644 index 000000000..33176abfe --- /dev/null +++ b/code/ryzom/server/src/session_browser_server/CMakeLists.txt @@ -0,0 +1,25 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(session_browser_service ${SRC}) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(session_browser_service admin_modules + ryzom_gameshare + server_share + ${PLATFORM_LINKFLAGS} + ${LIBXML2_LIBRARIES} + ${MYSQL_LIBRARIES} + ${ZLIB_LIBRARY} + ${NELMISC_LIBRARY} + ${NELNET_LIBRARY} + ${NELGEORGES_LIBRARY}) +IF(WIN32) + SET_TARGET_PROPERTIES(session_browser_service PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + PROJECT_LABEL "Services: Session Browser Service (SBS)") +ENDIF(WIN32) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS session_browser_service RUNTIME DESTINATION sbin COMPONENT services) + + diff --git a/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt b/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt new file mode 100644 index 000000000..6efd5bdc8 --- /dev/null +++ b/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt @@ -0,0 +1,25 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(shard_unifier_service ${SRC}) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(shard_unifier_service admin_modules + ryzom_gameshare + server_share + ${PLATFORM_LINKFLAGS} + ${LIBXML2_LIBRARIES} + ${MYSQL_LIBRARIES} + ${ZLIB_LIBRARY} + ${NELMISC_LIBRARY} + ${NELNET_LIBRARY} + ${NELGEORGES_LIBRARY}) +IF(WIN32) + SET_TARGET_PROPERTIES(shard_unifier_service PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + PROJECT_LABEL "Services: Shard Unifier Service (SUS)") +ENDIF(WIN32) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS shard_unifier_service RUNTIME DESTINATION sbin COMPONENT services) + + diff --git a/code/ryzom/server/src/tick_service/CMakeLists.txt b/code/ryzom/server/src/tick_service/CMakeLists.txt new file mode 100644 index 000000000..c5327a5ca --- /dev/null +++ b/code/ryzom/server/src/tick_service/CMakeLists.txt @@ -0,0 +1,22 @@ +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(tick_service ${SRC}) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(tick_service admin_modules + ryzom_gameshare + ${PLATFORM_LINKFLAGS} + ${LIBXML2_LIBRARIES} + ${NELMISC_LIBRARY} + ${NELNET_LIBRARY} + ${NELGEORGES_LIBRARY}) +IF(WIN32) + SET_TARGET_PROPERTIES(tick_service PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + PROJECT_LABEL "Services: Tick Service (TS)") +ENDIF(WIN32) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS tick_service RUNTIME DESTINATION sbin COMPONENT services) + +