From 91163ba7bb6ec08f1464ab33c8df8d83563778f9 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Sun, 2 Feb 2014 00:47:33 +0100
Subject: [PATCH] Properly handle NeL dependencies for Ryzom tools when
 disabling NeL libraries

---
 code/ryzom/tools/CMakeLists.txt             | 19 ++++++++----
 code/ryzom/tools/leveldesign/CMakeLists.txt | 33 ++++++++++++++-------
 code/ryzom/tools/server/CMakeLists.txt      | 10 +++++--
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/code/ryzom/tools/CMakeLists.txt b/code/ryzom/tools/CMakeLists.txt
index 456336254..631a3ad28 100644
--- a/code/ryzom/tools/CMakeLists.txt
+++ b/code/ryzom/tools/CMakeLists.txt
@@ -3,13 +3,22 @@ ADD_SUBDIRECTORY(make_alias_file)
 ADD_SUBDIRECTORY(make_anim_by_race)
 ADD_SUBDIRECTORY(make_anim_melee_impact)
 ADD_SUBDIRECTORY(pd_parser)
-ADD_SUBDIRECTORY(translation_tools)
 ADD_SUBDIRECTORY(assoc_mem)
 ADD_SUBDIRECTORY(leveldesign)
-ADD_SUBDIRECTORY(patch_gen)
-ADD_SUBDIRECTORY(pdr_util)
-ADD_SUBDIRECTORY(stats_scan)
-ADD_SUBDIRECTORY(sheets_packer) 
+
+IF(WITH_LIGO)
+  ADD_SUBDIRECTORY(translation_tools)
+ENDIF(WITH_LIGO)
+
+IF(WITH_NET)
+  ADD_SUBDIRECTORY(stats_scan)
+  ADD_SUBDIRECTORY(pdr_util)
+  ADD_SUBDIRECTORY(patch_gen)
+ENDIF(WITH_NET)
+
+IF(WITH_LIGO AND WITH_NET)
+  ADD_SUBDIRECTORY(sheets_packer)
+ENDIF(WITH_LIGO AND WITH_NET)
 
 IF(WITH_RYZOM_CLIENT)
   ADD_SUBDIRECTORY(client)
diff --git a/code/ryzom/tools/leveldesign/CMakeLists.txt b/code/ryzom/tools/leveldesign/CMakeLists.txt
index fd3ddc94a..9a56a2fac 100644
--- a/code/ryzom/tools/leveldesign/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/CMakeLists.txt
@@ -1,26 +1,39 @@
-ADD_SUBDIRECTORY(alias_synchronizer)
-ADD_SUBDIRECTORY(prim_export)
+
 ADD_SUBDIRECTORY(uni_conv)
 ADD_SUBDIRECTORY(csv_transform)
 ADD_SUBDIRECTORY(icon_search)
-ADD_SUBDIRECTORY(mission_compiler_lib)
+IF(WITH_LIGO)
+  ADD_SUBDIRECTORY(alias_synchronizer)
+  ADD_SUBDIRECTORY(prim_export)
+  ADD_SUBDIRECTORY(mission_compiler_lib)
+ENDIF(WITH_LIGO)
 ADD_SUBDIRECTORY(mp_generator)
 ADD_SUBDIRECTORY(named_items_2_csv)
 
 IF(WIN32)
-  ADD_SUBDIRECTORY(export)
-  ADD_SUBDIRECTORY(world_editor)
+  IF(WITH_LIGO)
+    ADD_SUBDIRECTORY(export)
+    ADD_SUBDIRECTORY(world_editor)
+  ENDIF(WITH_LIGO)
   IF(WITH_MFC)
-    ADD_SUBDIRECTORY(mission_compiler_fe)
-	ADD_SUBDIRECTORY(georges_dll)
-	ADD_SUBDIRECTORY(georges_exe)
-	ADD_SUBDIRECTORY(georges_plugin_sound)
+    IF(WITH_LIGO)
+      ADD_SUBDIRECTORY(mission_compiler_fe)
+    ENDIF(WITH_LIGO)
+    IF(WITH_GEORGES)
+      ADD_SUBDIRECTORY(georges_dll)
+      ADD_SUBDIRECTORY(georges_exe)
+      IF(WITH_SOUND)
+        ADD_SUBDIRECTORY(georges_plugin_sound)
+      ENDIF(WITH_SOUND)
+    ENDIF(WITH_GEORGES)
   ENDIF(WITH_MFC)
 ENDIF(WIN32)
 
 
 IF(WITH_QT)
-  ADD_SUBDIRECTORY(georges_editor_qt)
+  IF(WITH_GEORGES)
+    ADD_SUBDIRECTORY(georges_editor_qt)
+  ENDIF(WITH_GEORGES)
 ENDIF(WITH_QT)
 
 # folders not handled yet.
diff --git a/code/ryzom/tools/server/CMakeLists.txt b/code/ryzom/tools/server/CMakeLists.txt
index a9b765870..982c47718 100644
--- a/code/ryzom/tools/server/CMakeLists.txt
+++ b/code/ryzom/tools/server/CMakeLists.txt
@@ -1,6 +1,10 @@
-# Deprecated, no longer used
-ADD_SUBDIRECTORY(ai_build_wmap) 
-ADD_SUBDIRECTORY(build_world_packed_col)  
+
+IF(WITH_LIGO)
+  ADD_SUBDIRECTORY(ai_build_wmap)
+ENDIF(WITH_LIGO)
+IF(WITH_3D)
+  ADD_SUBDIRECTORY(build_world_packed_col)
+ENDIF(WITH_3D)
 
 # Not done yet.
 #admin