Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Change: #842 More root-build paths changes for NeL and Ryzom. Fixed some bad merges.

Browse source
This commit is contained in:
mattraykowski 2010-09-03 09:45:59 -06:00
parent c3e4ffbe26
commit cc43911ccb
23 changed files with 140 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/nel/CMakeLists.txt
View file

@ -1,18 +1,3 @@
# * NL_LIB_PREFIX (default: $CMAKE_INSTALL_PREFIX/lib)
# * NL_DRIVER_PREFIX (default: $CMAKE_INSTALL_PREFIX/lib (windows) or $CMAKE_INSTALL_PREFIX/lib/nel)
SET(EXTERNAL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../3rdParty" CACHE PATH "3rd party libraries root path.")
ENDIF(NOT EXTERNAL_PATH)
IF(NOT EXTERNAL_INCLUDE_PATH)
SET(EXTERNAL_INCLUDE_PATH "${EXTERNAL_PATH}/include" CACHE PATH "3rd party libraries include path.")
ENDIF(NOT EXTERNAL_INCLUDE_PATH)
IF(NOT EXTERNAL_LIBRARY_PATH)
SET(EXTERNAL_LIBRARY_PATH "${EXTERNAL_PATH}/lib" CACHE PATH "3rd party libraries lib path.")
ENDIF(NOT EXTERNAL_LIBRARY_PATH)
SET(CMAKE_INCLUDE_PATH "${EXTERNAL_INCLUDE_PATH};${CMAKE_INCLUDE_PATH}")
PROJECT(NeL CXX C) PROJECT(NeL CXX C)
IF(WITH_STATIC_DRIVERS) IF(WITH_STATIC_DRIVERS)
@ -115,7 +100,7 @@ ENDIF(WIN32)
ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(include)
# config.h configuration and use by projects # config.h configuration and use by projects
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
ADD_DEFINITIONS(-DHAVE_CONFIG_H) ADD_DEFINITIONS(-DHAVE_CONFIG_H)

2
code/nel/samples/net/chat/CMakeLists.txt
View file

@ -5,7 +5,7 @@ ADD_EXECUTABLE(nl_sample_chatserver WIN32 server.cpp)
ADD_DEFINITIONS(-DCHAT_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_chat/\\"") ADD_DEFINITIONS(-DCHAT_DIR="\\"${NL_SHARE_PREFIX}/nl_sample_chat/\\"")
TARGET_LINK_LIBRARIES(nl_sample_chatclient ${PLATFORM_LINKFLAGS} nelmisc nelnet) TARGET_LINK_LIBRARIES(nl_sample_chatclient ${PLATFORM_LINKFLAGS} nelmisc nelnet)
NL_DEFAULT_PROPS(nl_sample_chatclient "Samples, Net, Chat: Chat Client") NL_DEFAULT_PROPS(nl_sample_chatclient "NeL, Samples, Net, Chat: Chat Client")
NL_ADD_RUNTIME_FLAGS(nl_sample_chatclient) NL_ADD_RUNTIME_FLAGS(nl_sample_chatclient)
TARGET_LINK_LIBRARIES(nl_sample_chatserver ${PLATFORM_LINKFLAGS} nelmisc nelnet) TARGET_LINK_LIBRARIES(nl_sample_chatserver ${PLATFORM_LINKFLAGS} nelmisc nelnet)

2
code/nel/tools/3d/hls_bank_maker/CMakeLists.txt
View file

@ -5,7 +5,7 @@ ADD_EXECUTABLE(hls_bank_maker ${SRC})
INCLUDE_DIRECTORIES(${SQUISH_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${SQUISH_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(hls_bank_maker ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d) TARGET_LINK_LIBRARIES(hls_bank_maker ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d)
NL_DEFAULT_PROPS(hls_bank_maker "Tools, 3D: hls_bank_maker") NL_DEFAULT_PROPS(hls_bank_maker "NeL, Tools, 3D: hls_bank_maker")
NL_ADD_RUNTIME_FLAGS(hls_bank_maker) NL_ADD_RUNTIME_FLAGS(hls_bank_maker)
INSTALL(TARGETS hls_bank_maker RUNTIME DESTINATION bin COMPONENT tools3d) INSTALL(TARGETS hls_bank_maker RUNTIME DESTINATION bin COMPONENT tools3d)

4
code/nel/tools/3d/ig_elevation/CMakeLists.txt
View file

@ -5,9 +5,9 @@ ADD_EXECUTABLE(ig_elevation ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ig_elevation ${PLATFORM_LINKFLAGS} nelmisc nel3d nelligo) TARGET_LINK_LIBRARIES(ig_elevation ${PLATFORM_LINKFLAGS} nelmisc nel3d nelligo)
NL_DEFAULT_PROPS(ig_elevation "Tools, 3D: ig_elevation") NL_DEFAULT_PROPS(ig_elevation "NeL, Tools, 3D: ig_elevation")
NL_ADD_RUNTIME_FLAGS(ig_elevation) NL_ADD_RUNTIME_FLAGS(ig_elevation)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d) INSTALL(TARGETS ig_elevation RUNTIME DESTINATION bin COMPONENT tools3d)

4
code/nel/tools/3d/lightmap_optimizer/CMakeLists.txt
View file

@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(lightmap_optimizer ${SRC}) ADD_EXECUTABLE(lightmap_optimizer ${SRC})
TARGET_LINK_LIBRARIES(lightmap_optimizer ${PLATFORM_LINKFLAGS} nel3d nelmisc) TARGET_LINK_LIBRARIES(lightmap_optimizer ${PLATFORM_LINKFLAGS} nel3d nelmisc)
NL_DEFAULT_PROPS(lightmap_optimizer "Tools, 3D: lightmap_optimizer") NL_DEFAULT_PROPS(lightmap_optimizer "NeL, Tools, 3D: lightmap_optimizer")
NL_ADD_RUNTIME_FLAGS(lightmap_optimizer) NL_ADD_RUNTIME_FLAGS(lightmap_optimizer)
INSTALL(TARGETS lightmap_optimizer RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d) INSTALL(TARGETS lightmap_optimizer RUNTIME DESTINATION bin COMPONENT tools3d)

2
code/nel/tools/3d/tga_2_dds/CMakeLists.txt
View file

@ -5,7 +5,7 @@ ADD_EXECUTABLE(tga2dds ${SRC})
INCLUDE_DIRECTORIES(${SQUISH_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${SQUISH_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(tga2dds ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d) TARGET_LINK_LIBRARIES(tga2dds ${PLATFORM_LINKFLAGS} ${SQUISH_LIBRARY} nelmisc nel3d)
NL_DEFAULT_PROPS(tga2dds "Tools, 3D: tga2dds") NL_DEFAULT_PROPS(tga2dds "NeL, Tools, 3D: tga2dds")
NL_ADD_RUNTIME_FLAGS(tga2dds) NL_ADD_RUNTIME_FLAGS(tga2dds)
INSTALL(TARGETS tga2dds RUNTIME DESTINATION bin COMPONENT tools3d) INSTALL(TARGETS tga2dds RUNTIME DESTINATION bin COMPONENT tools3d)

2
code/nel/tools/memory/memlog/CMakeLists.txt
View file

@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(memlog ${SRC}) ADD_EXECUTABLE(memlog ${SRC})
TARGET_LINK_LIBRARIES(memlog ${PLATFORM_LINKFLAGS} nelmisc) TARGET_LINK_LIBRARIES(memlog ${PLATFORM_LINKFLAGS} nelmisc)
NL_DEFAULT_PROPS(memlog "Tools, Memory: memlog") NL_DEFAULT_PROPS(memlog "NeL, Tools, Memory: memlog")
NL_ADD_RUNTIME_FLAGS(memlog) NL_ADD_RUNTIME_FLAGS(memlog)
INSTALL(TARGETS memlog RUNTIME DESTINATION bin COMPONENT toolsmisc) INSTALL(TARGETS memlog RUNTIME DESTINATION bin COMPONENT toolsmisc)

23
code/ryzom/server/src/gpm_service/CMakeLists.txt
View file

@ -1,23 +1,22 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(gpm_service ${SRC}) ADD_EXECUTABLE(gpm_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(gpm_service admin_modules TARGET_LINK_LIBRARIES(gpm_service admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELPACS_LIBRARY} nelpacs
${NELGEORGES_LIBRARY} nelgeorges
${NELLIGO_LIBRARY}) nelligo)
IF(WIN32)
SET_TARGET_PROPERTIES(gpm_service PROPERTIES NL_DEFAULT_PROPS(gpm_service "Ryzom, Services: Global Position Manager Service (GPMS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(gpm_service)
PROJECT_LABEL "Services: Global Position Manager Service (GPMS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS gpm_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS gpm_service RUNTIME DESTINATION sbin COMPONENT services)

22
code/ryzom/server/src/input_output_service/CMakeLists.txt
View file

@ -9,25 +9,23 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ios_pd.h ${CMAKE_CURRENT_SOURCE_DIR}/ios_pd.h
${CMAKE_CURRENT_SOURCE_DIR}/ios_pd_inline.h) ${CMAKE_CURRENT_SOURCE_DIR}/ios_pd_inline.h)
ADD_EXECUTABLE(ios_service ${SRC}) ADD_EXECUTABLE(ios_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ios_service admin_modules TARGET_LINK_LIBRARIES(ios_service admin_modules
pd_lib pd_lib
ryzom_gameshare ryzom_gameshare
server_share server_share
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELPACS_LIBRARY} nelpacs
${NELGEORGES_LIBRARY} nelgeorges
${NELLIGO_LIBRARY}) nelligo)
IF(WIN32)
SET_TARGET_PROPERTIES(ios_service PROPERTIES NL_DEFAULT_PROPS(ios_service "Ryzom, Services: Input Ouput Service (IOS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(ios_service)
PROJECT_LABEL "Services: Input Ouput Service (IOS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

19
code/ryzom/server/src/log_analyser_service/CMakeLists.txt
View file

@ -1,21 +1,20 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(log_analyser_service ${SRC}) ADD_EXECUTABLE(log_analyser_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(log_analyser_service admin_modules TARGET_LINK_LIBRARIES(log_analyser_service admin_modules
ryzom_gameshare ryzom_gameshare
pd_lib pd_lib
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELGEORGES_LIBRARY}) nelgeorges)
IF(WIN32)
SET_TARGET_PROPERTIES(log_analyser_service PROPERTIES NL_DEFAULT_PROPS(log_analyser_service "Ryzom, Services: Log Analyzer Service (LAS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(log_analyser_service)
PROJECT_LABEL "Services: Log Analyzer Service (LAS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS log_analyser_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS log_analyser_service RUNTIME DESTINATION sbin COMPONENT services)

17
code/ryzom/server/src/logger_service/CMakeLists.txt
View file

@ -1,20 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(logger_service ${SRC}) ADD_EXECUTABLE(logger_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(logger_service admin_modules TARGET_LINK_LIBRARIES(logger_service admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(logger_service PROPERTIES NL_DEFAULT_PROPS(logger_service "Ryzom, Services: Logger Service (LGS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(logger_service)
PROJECT_LABEL "Services: Logger Service (LGS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS logger_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS logger_service RUNTIME DESTINATION sbin COMPONENT services)

17
code/ryzom/server/src/mail_forum_service/CMakeLists.txt
View file

@ -1,20 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(mail_forum_service ${SRC}) ADD_EXECUTABLE(mail_forum_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(mail_forum_service admin_modules TARGET_LINK_LIBRARIES(mail_forum_service admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(mail_forum_service PROPERTIES NL_DEFAULT_PROPS(mail_forum_service "Ryzom, Services: Mail Forum Service (MFS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(mail_forum_service)
PROJECT_LABEL "Services: Mail Forum Service (MFS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH) IF(WITH_PCH)

19
code/ryzom/server/src/mirror_service/CMakeLists.txt
View file

@ -1,20 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(mirror_service ${SRC}) ADD_EXECUTABLE(mirror_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(mirror_service admin_modules TARGET_LINK_LIBRARIES(mirror_service admin_modules
ryzom_gameshare ryzom_gameshare
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELGEORGES_LIBRARY}) nelgeorges)
IF(WIN32)
SET_TARGET_PROPERTIES(mirror_service PROPERTIES NL_DEFAULT_PROPS(mirror_service "Ryzom, Services: Mirror Service (MS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(mirror_service)
PROJECT_LABEL "Services: Mirror Service (MS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS mirror_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS mirror_service RUNTIME DESTINATION sbin COMPONENT services)

18
code/ryzom/server/src/monitor_service/CMakeLists.txt
View file

@ -1,21 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(monitor_service ${SRC}) ADD_EXECUTABLE(monitor_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(monitor_service ryzom_gameshare TARGET_LINK_LIBRARIES(monitor_service ryzom_gameshare
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${MYSQL_LIBRARIES} ${MYSQL_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELGEORGES_LIBRARY}) nelgeorges)
IF(WIN32)
SET_TARGET_PROPERTIES(monitor_service PROPERTIES NL_DEFAULT_PROPS(monitor_service "Ryzom, Services: Monitor Service (MOS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(monitor_service)
PROJECT_LABEL "Services: Monitor Service (MOS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

2
code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
View file

@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(reference_builder_service ${SRC}) ADD_EXECUTABLE(reference_builder_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(reference_builder_service TARGET_LINK_LIBRARIES(reference_builder_service
ryzom_gameshare ryzom_gameshare
pd_lib pd_lib

17
code/ryzom/server/src/pd_support_service/CMakeLists.txt
View file

@ -1,20 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(pd_support_service ${SRC}) ADD_EXECUTABLE(pd_support_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(pd_support_service admin_modules TARGET_LINK_LIBRARIES(pd_support_service admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(pd_support_service PROPERTIES NL_DEFAULT_PROPS(pd_support_service "Ryzom, Services: PD Support Service (PDSS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(pd_support_service)
PROJECT_LABEL "Services: PD Support Service (PDSS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS pd_support_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS pd_support_service RUNTIME DESTINATION sbin COMPONENT services)

17
code/ryzom/server/src/persistant_data_service/CMakeLists.txt
View file

@ -1,20 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(persistant_data_service ${SRC}) ADD_EXECUTABLE(persistant_data_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(persistant_data_service admin_modules TARGET_LINK_LIBRARIES(persistant_data_service admin_modules
ryzom_gameshare ryzom_gameshare
pd_lib pd_lib
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(persistant_data_service PROPERTIES NL_DEFAULT_PROPS(persistant_data_service "Ryzom, Services: Persistent Data Service (PDS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(persistant_data_service)
PROJECT_LABEL "Services: Persistent Data Service (PDS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS persistant_data_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS persistant_data_service RUNTIME DESTINATION sbin COMPONENT services)

17
code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
View file

@ -1,18 +1,17 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_admin_service ${SRC}) ADD_EXECUTABLE(ryzom_admin_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_admin_service admin_modules TARGET_LINK_LIBRARIES(ryzom_admin_service admin_modules
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(ryzom_admin_service PROPERTIES NL_DEFAULT_PROPS(ryzom_admin_service "Ryzom, Services: Ryzom Admin Service (AS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(ryzom_admin_service)
PROJECT_LABEL "Services: Ryzom Admin Service (AS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ryzom_admin_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS ryzom_admin_service RUNTIME DESTINATION sbin COMPONENT services)

17
code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
View file

@ -1,18 +1,17 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_naming_service ${SRC}) ADD_EXECUTABLE(ryzom_naming_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_naming_service admin_modules TARGET_LINK_LIBRARIES(ryzom_naming_service admin_modules
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(ryzom_naming_service PROPERTIES NL_DEFAULT_PROPS(ryzom_naming_service "Ryzom, Services: Ryzom Naming Service (NS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(ryzom_naming_service)
PROJECT_LABEL "Services: Ryzom Naming Service (NS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ryzom_naming_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS ryzom_naming_service RUNTIME DESTINATION sbin COMPONENT services)

17
code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
View file

@ -1,19 +1,18 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_welcome_service ${SRC}) ADD_EXECUTABLE(ryzom_welcome_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_welcome_service admin_modules TARGET_LINK_LIBRARIES(ryzom_welcome_service admin_modules
ryzom_gameshare ryzom_gameshare
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY}) nelnet)
IF(WIN32)
SET_TARGET_PROPERTIES(ryzom_welcome_service PROPERTIES NL_DEFAULT_PROPS(ryzom_welcome_service "Ryzom, Services: Ryzom Welcome Service (WS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(ryzom_welcome_service)
PROJECT_LABEL "Services: Ryzom Welcome Service (WS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ryzom_welcome_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS ryzom_welcome_service RUNTIME DESTINATION sbin COMPONENT services)

19
code/ryzom/server/src/session_browser_server/CMakeLists.txt
View file

@ -1,8 +1,8 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(session_browser_service ${SRC}) ADD_EXECUTABLE(session_browser_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(session_browser_service admin_modules TARGET_LINK_LIBRARIES(session_browser_service admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
@ -10,14 +10,13 @@ TARGET_LINK_LIBRARIES(session_browser_service admin_modules
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES} ${MYSQL_LIBRARIES}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELGEORGES_LIBRARY}) nelgeorges)
IF(WIN32)
SET_TARGET_PROPERTIES(session_browser_service PROPERTIES NL_DEFAULT_PROPS(session_browser_service "Ryzom, Services: Session Browser Service (SBS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(session_browser_service)
PROJECT_LABEL "Services: Session Browser Service (SBS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS session_browser_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS session_browser_service RUNTIME DESTINATION sbin COMPONENT services)

19
code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
View file

@ -1,8 +1,8 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(shard_unifier_service ${SRC}) ADD_EXECUTABLE(shard_unifier_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(shard_unifier_service admin_modules TARGET_LINK_LIBRARIES(shard_unifier_service admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
@ -10,14 +10,13 @@ TARGET_LINK_LIBRARIES(shard_unifier_service admin_modules
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES} ${MYSQL_LIBRARIES}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELGEORGES_LIBRARY}) nelgeorges)
IF(WIN32)
SET_TARGET_PROPERTIES(shard_unifier_service PROPERTIES NL_DEFAULT_PROPS(shard_unifier_service "Ryzom, Services: Shard Unifier Service (SUS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(shard_unifier_service)
PROJECT_LABEL "Services: Shard Unifier Service (SUS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH) IF(WITH_PCH)

19
code/ryzom/server/src/tick_service/CMakeLists.txt
View file

@ -1,20 +1,19 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(tick_service ${SRC}) ADD_EXECUTABLE(tick_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(tick_service admin_modules TARGET_LINK_LIBRARIES(tick_service admin_modules
ryzom_gameshare ryzom_gameshare
${PLATFORM_LINKFLAGS} ${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES} ${LIBXML2_LIBRARIES}
${NELMISC_LIBRARY} nelmisc
${NELNET_LIBRARY} nelnet
${NELGEORGES_LIBRARY}) nelgeorges)
IF(WIN32)
SET_TARGET_PROPERTIES(tick_service PROPERTIES NL_DEFAULT_PROPS(tick_service "Ryzom, Services: Tick Service (TS)")
LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" NL_ADD_RUNTIME_FLAGS(tick_service)
PROJECT_LABEL "Services: Tick Service (TS)")
ENDIF(WIN32)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS tick_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS tick_service RUNTIME DESTINATION sbin COMPONENT services)