From cf7ecf98577f393b08b330e09f6383e5582dc954 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 14 May 2016 18:53:57 +0200 Subject: [PATCH] Changed: Only compile installer if WITH_RYZOM_INSTALLER set --HG-- branch : feature-ryzom-installer --- code/CMakeModules/nel.cmake | 2 +- code/ryzom/tools/client/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index 51ffaf950..70306482b 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -321,7 +321,7 @@ MACRO(NL_SETUP_RYZOM_DEFAULT_OPTIONS) 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_INSTALLER "Build Ryzom Installer" OFF) ### # Optional support diff --git a/code/ryzom/tools/client/CMakeLists.txt b/code/ryzom/tools/client/CMakeLists.txt index 7fa015c47..7d7abf08f 100644 --- a/code/ryzom/tools/client/CMakeLists.txt +++ b/code/ryzom/tools/client/CMakeLists.txt @@ -3,8 +3,12 @@ IF(WITH_RYZOM_CLIENT) IF(WITH_QT OR WITH_QT5) ADD_SUBDIRECTORY(client_config_qt) - ADD_SUBDIRECTORY(ryzom_installer) + + IF(WITH_RYZOM_INSTALLER) + ADD_SUBDIRECTORY(ryzom_installer) + ENDIF() ENDIF() + ENDIF() IF(WITH_RYZOM_TOOLS)