From 389e5712dfaf03afbde60c992d22c4ac5173414b Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sun, 12 Jun 2016 14:13:42 +0200
Subject: [PATCH] Changed: Allow to compile Ryzom Installer alone

--HG--
branch : develop
---
 code/ryzom/CMakeLists.txt              | 12 +-----------
 code/ryzom/client/CMakeLists.txt       |  1 +
 code/ryzom/client/src/CMakeLists.txt   | 16 ++++++++++++----
 code/ryzom/tools/client/CMakeLists.txt |  8 ++++----
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index 3b955306f..46c8bcb68 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -8,17 +8,7 @@ SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
 
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(tools)
-
-IF(WITH_RYZOM_CLIENT)
-  IF(NOT WITH_GUI)
-    MESSAGE( FATAL_ERROR "The client cannot be built without the NeL GUI Library (WITH_GUI)")
-  ENDIF()
-
-  ADD_SUBDIRECTORY(client)
-ELSEIF(WITH_RYZOM_TOOLS)
-  # Need clientsheets lib for sheets packer tool
-  ADD_SUBDIRECTORY(client)
-ENDIF()
+ADD_SUBDIRECTORY(client)
 
 IF(WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS)
   # Need servershare for build packed collision tool
diff --git a/code/ryzom/client/CMakeLists.txt b/code/ryzom/client/CMakeLists.txt
index 106f553bd..919f9fe22 100644
--- a/code/ryzom/client/CMakeLists.txt
+++ b/code/ryzom/client/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Need clientsheets lib for sheets packer tool
+# Need seven_zip for patch_gen and ryzom_installer
 ADD_SUBDIRECTORY(src)
 
 IF(WITH_RYZOM_CLIENT)
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index e6a842c48..1c703efaf 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -1,10 +1,18 @@
-# Need clientsheets lib for sheets packer tool
-ADD_SUBDIRECTORY(client_sheets)
+IF(WITH_RYZOM_TOOLS OR WITH_RYZOM_CLIENT)
+  # Need clientsheets lib for sheets packer tool
+  ADD_SUBDIRECTORY(client_sheets)
+ENDIF()
 
-# Need seven_zip lib for patch_gen tool
-ADD_SUBDIRECTORY(seven_zip)
+IF(WITH_RYZOM_TOOLS OR WITH_RYZOM_CLIENT OR WITH_RYZOM_INSTALLER)
+  # Need seven_zip lib for patch_gen tool
+  ADD_SUBDIRECTORY(seven_zip)
+ENDIF()
 
 IF(WITH_RYZOM_CLIENT)
+  IF(NOT WITH_GUI)
+    MESSAGE(FATAL_ERROR "The client cannot be built without the NeL GUI Library (WITH_GUI)")
+  ENDIF()
+
   IF(WITH_RYZOM_PATCH)
     ADD_DEFINITIONS(-DRZ_USE_PATCH)
 
diff --git a/code/ryzom/tools/client/CMakeLists.txt b/code/ryzom/tools/client/CMakeLists.txt
index 7d7abf08f..51cae98e7 100644
--- a/code/ryzom/tools/client/CMakeLists.txt
+++ b/code/ryzom/tools/client/CMakeLists.txt
@@ -3,14 +3,14 @@ IF(WITH_RYZOM_CLIENT)
 
   IF(WITH_QT OR WITH_QT5)
     ADD_SUBDIRECTORY(client_config_qt)
-
-    IF(WITH_RYZOM_INSTALLER)
-      ADD_SUBDIRECTORY(ryzom_installer)
-    ENDIF()
   ENDIF()
 
 ENDIF()
 
+IF(WITH_QT5 AND WITH_RYZOM_INSTALLER)
+  ADD_SUBDIRECTORY(ryzom_installer)
+ENDIF()
+
 IF(WITH_RYZOM_TOOLS)
   ADD_SUBDIRECTORY(r2_islands_textures)
 ENDIF()