From beb6f391365f0f787f68dee191a9b57d9d2f1a2e Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 25 Sep 2010 17:24:19 +0200 Subject: [PATCH] Added: Options to build NeLNS and Snowballs (OFF by default) --- code/CMakeLists.txt | 14 +++++++++++ code/CMakeModules/nel.cmake | 48 ++++++++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index fb35b21ef..fb98670ac 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -65,7 +65,9 @@ ENDIF(WIN32) # NL_SETUP_DEFAULT_OPTIONS() NL_SETUP_NEL_DEFAULT_OPTIONS() +NL_SETUP_NELNS_DEFAULT_OPTIONS() NL_SETUP_RYZOM_DEFAULT_OPTIONS() +NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS() NL_SETUP_PREFIX_PATHS() #----------------------------------------------------------------------------- @@ -132,6 +134,18 @@ IF(WITH_RYZOM) ADD_SUBDIRECTORY(ryzom) ENDIF(WITH_RYZOM) +IF(WITH_NELNS) +# ADD_SUBDIRECTORY(nelns) +ENDIF(WITH_NELNS) + +IF(WITH_SNOWBALLS) +# ADD_SUBDIRECTORY(snowballs2) +ENDIF(WITH_SNOWBALLS) + +IF(WITH_TOOLS) + ADD_SUBDIRECTORY(tool) +ENDIF(WITH_TOOLS) + # To build the documention, you will have to enable it # and then do the equivalent of "make DoxygenDoc". IF(BUILD_DOCUMENTATION) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index bf50e5b73..cb6846145 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -176,9 +176,10 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) OPTION(WITH_STLPORT "With STLport support." OFF) OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) - OPTION(WITH_NEL "Build NeL (nearly always required)." ON ) - OPTION(WITH_NELNS "Build NeL Network Services." ON ) - OPTION(WITH_RYZOM "Build Ryzom Core." ON ) + OPTION(WITH_NEL "Build NeL (nearly always required)." ON ) + OPTION(WITH_NELNS "Build NeL Network Services." OFF) + OPTION(WITH_RYZOM "Build Ryzom Core." ON ) + OPTION(WITH_SNOWBALLS "Build Snowballs." OFF) ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) @@ -206,26 +207,45 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) ### # Optional support ### - OPTION(WITH_NEL_CEGUI "Build CEGUI Renderer" OFF) - OPTION(WITH_NEL_TOOLS "Build NeL Tools" ON ) - OPTION(WITH_NEL_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) - OPTION(WITH_NEL_SAMPLES "Build NeL Samples" ON ) - OPTION(WITH_NEL_TESTS "Build NeL Unit Tests" ON ) - OPTION(WITH_MFC "With MFC Support" ON ) + OPTION(WITH_NEL_CEGUI "Build CEGUI Renderer" OFF) + OPTION(WITH_NEL_TOOLS "Build NeL Tools" ON ) + OPTION(WITH_NEL_MAXPLUGIN "Build NeL 3dsMax Plugin" OFF) + OPTION(WITH_NEL_SAMPLES "Build NeL Samples" ON ) + OPTION(WITH_NEL_TESTS "Build NeL Unit Tests" ON ) + OPTION(WITH_MFC "With MFC Support" ON ) ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS) +MACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS) + ### + # Core libraries + ### + OPTION(WITH_NELNS_SERVER "Build NeLNS Services" ON ) + OPTION(WITH_NELNS_LOGIN_SYSTEM "Build NeLNS Login System Tools" ON ) +ENDMACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS) + MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) ### # Core libraries ### - OPTION(WITH_RYZOM_CLIENT "Build Ryzom Core Client" ON ) - OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON ) - OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON ) - OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON ) + OPTION(WITH_RYZOM_CLIENT "Build Ryzom Core Client" ON ) + OPTION(WITH_RYZOM_TOOLS "Build Ryzom Core Tools" ON ) + OPTION(WITH_RYZOM_SERVER "Build Ryzom Core Services" ON ) + OPTION(WITH_RYZOM_SOUND "Enable Ryzom Core Sound" ON ) - OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" ON ) + ### + # Optional support + ### + OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" ON ) ENDMACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) +MACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS) + ### + # Core libraries + ### + OPTION(WITH_SNOWBALLS_CLIENT "Build Snowballs Client" ON ) + OPTION(WITH_SNOWBALLS_SERVER "Build Snowballs Services" ON ) +ENDMACRO(NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS) + MACRO(NL_SETUP_BUILD) #-----------------------------------------------------------------------------