From 528259c886a282fe668934e69d428f453d7b8626 Mon Sep 17 00:00:00 2001 From: Matt Raykowski Date: Wed, 12 May 2010 13:21:55 -0500 Subject: [PATCH] Update: #842 Starting to add services to CMake, added admin_modules and frontend_service. --- code/ryzom/CMakeLists.txt | 3 ++ code/ryzom/server/CMakeLists.txt | 1 + code/ryzom/server/src/CMakeLists.txt | 38 +++++++++++++++++++ .../server/src/admin_modules/CMakeLists.txt | 27 +++++++++++++ .../src/frontend_service/CMakeLists.txt | 25 ++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 code/ryzom/server/CMakeLists.txt create mode 100644 code/ryzom/server/src/CMakeLists.txt create mode 100644 code/ryzom/server/src/admin_modules/CMakeLists.txt create mode 100644 code/ryzom/server/src/frontend_service/CMakeLists.txt diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 10762ab1a..0a4a75f6b 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -116,3 +116,6 @@ IF(WITH_TOOLS) ADD_SUBDIRECTORY(tools) ENDIF(WITH_TOOLS) +IF(WITH_SERVER) + ADD_SUBDIRECTORY(server) +ENDIF(WITH_SERVER) diff --git a/code/ryzom/server/CMakeLists.txt b/code/ryzom/server/CMakeLists.txt new file mode 100644 index 000000000..4b7537b55 --- /dev/null +++ b/code/ryzom/server/CMakeLists.txt @@ -0,0 +1 @@ +ADD_SUBDIRECTORY(src) diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt new file mode 100644 index 000000000..16bf7d94d --- /dev/null +++ b/code/ryzom/server/src/CMakeLists.txt @@ -0,0 +1,38 @@ +ADD_SUBDIRECTORY(admin_modules) + +ADD_SUBDIRECTORY(frontend_service) + + +#ags_test +#ai_data_service +#ai_service +#ai_share +#backup_service +#dynamic_scenario_service +#entities_game_service +#entity_view_service +#frontend_service +#gameplay_module_lib +#general_utilities_service +#gpm_service +#input_output_service +#log_analyser_service +#logger_service +#mail_forum_service +#mirror_service +#monitor_service +#patchman_service +#pd_lib +#pd_reference_builder +#pd_support_service +#persistant_data_service +#ryzom_admin_service +#ryzom_naming_service +#ryzom_welcome_service +#sabrina +#server_share +#session_browser_server +#shard_unifier_service +#simulation_service +#testing_tool_service +#tick_service diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt new file mode 100644 index 000000000..10963871a --- /dev/null +++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt @@ -0,0 +1,27 @@ +FILE(GLOB SRC *.cpp *.h) + +# Filter out the source files not actually compiled. +LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp) + +IF(WIN32) + ADD_LIBRARY(admin_modules STATIC ${SRC}) +ELSE(WIN32) + ADD_LIBRARY(admin_modules SHARED ${SRC}) +ENDIF(WIN32) + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(admin_modules ${NELMISC_LIBRARY}) +SET_TARGET_PROPERTIES(admin_modules PROPERTIES VERSION ${NL_VERSION}) + +IF(WIN32) + SET_TARGET_PROPERTIES(admin_modules + PROJECT_LABEL "Library: Admin Modules" + DEBUG_POSTFIX "_d" + RELEASE_POSTFIX "_r" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" + LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") +ENDIF(WIN32) + +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS admin_modules LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt new file mode 100644 index 000000000..7f0d7c8db --- /dev/null +++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt @@ -0,0 +1,25 @@ +FILE(GLOB SRC *.cpp *.h) + +LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.h + ${CMAKE_CURRENT_SOURCE_DIR}/prioritizer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/prioritizer.h + ${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.h) + +ADD_EXECUTABLE(frontend_service ${SRC}) + + + + +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(frontend_service admin_modules game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY}) +IF(WIN32) + SET_TARGET_PROPERTIES(frontend_service PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + PROJECT_LABEL "Services: Frontend Service") +ENDIF(WIN32) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS frontend_service RUNTIME DESTINATION sbin COMPONENT services) +