Merge with default

--HG--
branch : multipass-stereo

code/nel/CMakeLists.txt

@@ -72,7 +72,11 @@ IF(WITH_NEL_SAMPLES)
   ADD_SUBDIRECTORY(samples)
 ENDIF(WITH_NEL_SAMPLES)
 
+# Allow to compile only max plugins without other tools.
+IF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
   IF(WITH_NEL_TOOLS)
     FIND_PACKAGE(Squish)
-  ADD_SUBDIRECTORY(tools)
   ENDIF(WITH_NEL_TOOLS)
+  ADD_SUBDIRECTORY(tools)
+ENDIF(WITH_NEL_TOOLS OR WITH_NEL_MAXPLUGIN)
+

code/nel/tools/3d/CMakeLists.txt

@@ -1,3 +1,6 @@
+
+IF(WITH_NEL_TOOLS)
+
   SUBDIRS(
     build_coarse_mesh
     build_far_bank
@@ -26,23 +29,30 @@ SUBDIRS(
     zone_dump
     zviewer)
 
-IF(WIN32)
-  ADD_SUBDIRECTORY(ig_elevation)
-  ADD_SUBDIRECTORY(lightmap_optimizer)
+ENDIF(WITH_NEL_TOOLS)
 
+# For tools selection of only max plugins
+IF(WIN32)  
   IF(MFC_FOUND)
     ADD_SUBDIRECTORY(object_viewer)
-    ADD_SUBDIRECTORY(object_viewer_exe)
-    ADD_SUBDIRECTORY(tile_edit)
-  ENDIF(MFC_FOUND)
-
     IF(WITH_NEL_MAXPLUGIN)
       IF(MAXSDK_FOUND)
         ADD_SUBDIRECTORY(plugin_max)
         ADD_SUBDIRECTORY(ligo)
       ENDIF(MAXSDK_FOUND)
     ENDIF(WITH_NEL_MAXPLUGIN)
+  ENDIF(MFC_FOUND)
+ENDIF(WIN32)
 
+IF(WITH_NEL_TOOLS)
+
+  IF(WIN32)
+    ADD_SUBDIRECTORY(ig_elevation)
+    ADD_SUBDIRECTORY(lightmap_optimizer)  
+    IF(MFC_FOUND)
+      ADD_SUBDIRECTORY(object_viewer_exe)
+      ADD_SUBDIRECTORY(tile_edit)
+    ENDIF(MFC_FOUND)
   ENDIF(WIN32)
   
   IF(WITH_QT)
@@ -60,3 +70,6 @@ ENDIF(SQUISH_FOUND)
 
   #crash_log_analyser
   #shapes_exporter
+
+ENDIF(WITH_NEL_TOOLS)
+

code/nel/tools/CMakeLists.txt

@@ -1,10 +1,17 @@
+
+# Don't add other subdirectories if only max plugins are selected.
+IF(WITH_NEL_TOOLS)
   ADD_SUBDIRECTORY(misc)
   ADD_SUBDIRECTORY(memory)
+ENDIF(WITH_NEL_TOOLS)
 
+# Max plugins are under the 3d directory as well.
 IF(WITH_3D)
   ADD_SUBDIRECTORY(3d)
 ENDIF(WITH_3D)
 
+# Don't add other subdirectories if only max plugins are selected.
+IF(WITH_NEL_TOOLS)
   IF(WITH_PACS)
     ADD_SUBDIRECTORY(pacs)
   ENDIF(WITH_PACS)
@@ -24,5 +31,4 @@ ENDIF(WITH_SOUND)
   IF(WITH_NEL_TESTS)
     ADD_SUBDIRECTORY(nel_unit_test)
   ENDIF(WITH_NEL_TESTS)
-
-#build_gamedata
+ENDIF(WITH_NEL_TOOLS)