start cleaning dependencies between options

CMakeLists.txt

@@ -405,7 +405,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
   if(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS)
     message(SEND_ERROR "Cannot compile GUI without Mesh, Post or Plugin modules")
   endif(NOT HAVE_MESH OR NOT HAVE_POST OR NOT HAVE_PLUGINS)
-  # get jpeg lib
+
   if(FLTK_JPEG)
     set_config_option(HAVE_LIBJPEG "Jpeg(Fltk)")
   else(FLTK_JPEG)
@@ -416,7 +416,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
       list(APPEND EXTERNAL_INCLUDES ${JPEG_INCLUDE_DIR})
     endif(JPEG_FOUND)
   endif(FLTK_JPEG)
-  # get zlib
+
   if(FLTK_Z)
     set_config_option(HAVE_LIBZ "Zlib(Fltk)")
   else(FLTK_Z)
@@ -427,7 +427,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
       list(APPEND EXTERNAL_INCLUDES ${ZLIB_INCLUDE_DIR})
     endif(ZLIB_FOUND)
   endif(FLTK_Z)
-  # get png lib
+
   if(HAVE_LIBZ)
     if(FLTK_PNG)
       set_config_option(HAVE_LIBPNG "Png(Fltk)")
@@ -440,6 +440,21 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
       endif(PNG_FOUND)
     endif(FLTK_PNG)
   endif(HAVE_LIBZ)
+
+  if(ENABLE_MPEG_ENCODE)
+    add_subdirectory(contrib/mpeg_encode)
+    include_directories(contrib/mpeg_encode/headers)
+    set_config_option(HAVE_MPEG_ENCODE "Mpeg")
+  endif(ENABLE_MPEG_ENCODE)
+
+  if(ENABLE_OSMESA)
+    find_library(OSMESA_LIB OSMesa)
+    if(OSMESA_LIB)
+      set_config_option(HAVE_OSMESA "OSMesa")
+      list(APPEND EXTERNAL_LIBRARIES ${OSMESA_LIB})
+    endif(OSMESA_LIB)
+  endif(ENABLE_OSMESA)
+
   find_package(OpenGL REQUIRED)
   if(OPENGL_GLU_FOUND)
     add_subdirectory(Graphics)
@@ -449,6 +464,7 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
   endif(OPENGL_GLU_FOUND)
 endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
 
+if(HAVE_MESH OR HAVE_PLUGINS)
   if(ENABLE_ANN)
     find_library(ANN_LIB ann PATH_SUFFIXES lib)
     find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN)
@@ -462,19 +478,7 @@ if(ENABLE_ANN)
     endif(ANN_LIB AND ANN_INC)
     set_config_option(HAVE_ANN "Ann")
   endif(ENABLE_ANN)
-
-if(ENABLE_BLOSSOM)
-  add_subdirectory(contrib/blossom)
-  include_directories(contrib/blossom/MATCH contrib/blossom/concorde97
-                      contrib/blossom/concorde97/INCLUDE)
-  set_config_option(HAVE_BLOSSOM "Blossom")
-endif(ENABLE_BLOSSOM)
-
-if(ENABLE_CHACO)
-  add_subdirectory(contrib/Chaco)
-  include_directories(contrib/Chaco/main)
-  set_config_option(HAVE_CHACO "Chaco")
-endif(ENABLE_CHACO)
+endif(HAVE_MESH OR HAVE_PLUGINS)
 
 if(ENABLE_BFGS)
   add_subdirectory(contrib/lbfgs)
@@ -488,17 +492,6 @@ if(ENABLE_DINTEGRATION)
   set_config_option(HAVE_DINTEGRATION "DIntegration")
 endif(ENABLE_DINTEGRATION)
 
-if(ENABLE_GMM)
-  find_path(GMM_INC "gmm.h" PATH_SUFFIXES src include include/gmm)
-  if(GMM_INC)
-    list(APPEND EXTERNAL_INCLUDES ${GMM_INC})
-  else(GMM_INC)
-    message(STATUS "System GMM not found - using contrib/gmm instead")
-    include_directories(contrib/gmm)
-  endif(GMM_INC)
-  set_config_option(HAVE_GMM "Gmm")
-endif(ENABLE_GMM)
-
 if(ENABLE_KBIPACK)
   find_library(GMP_LIB gmp)
   if(GMP_LIB)
@@ -531,12 +524,7 @@ if(ENABLE_MPI)
    endif(MPI_FOUND)
 endif(ENABLE_MPI)
 
-if(ENABLE_MPEG_ENCODE)
-  add_subdirectory(contrib/mpeg_encode)
-  include_directories(contrib/mpeg_encode/headers)
-  set_config_option(HAVE_MPEG_ENCODE "Mpeg")
-endif(ENABLE_MPEG_ENCODE)
-
+if(HAVE_MESH OR HAVE_SOLVER)
   if(ENABLE_METIS)
     add_subdirectory(contrib/Metis)
     include_directories(contrib/Metis)
@@ -545,7 +533,21 @@ if(ENABLE_METIS)
             "licensing requirements stated in contrib/Metis/README.txt.")
   endif(ENABLE_METIS)
 
+  if(ENABLE_CHACO)
+    add_subdirectory(contrib/Chaco)
+    include_directories(contrib/Chaco/main)
+    set_config_option(HAVE_CHACO "Chaco")
+  endif(ENABLE_CHACO)
+endif(HAVE_MESH OR HAVE_SOLVER)
+
 if(HAVE_MESH)
+  if(ENABLE_BLOSSOM)
+    add_subdirectory(contrib/blossom)
+    include_directories(contrib/blossom/MATCH contrib/blossom/concorde97
+                        contrib/blossom/concorde97/INCLUDE)
+    set_config_option(HAVE_BLOSSOM "Blossom")
+  endif(ENABLE_BLOSSOM)
+
   if(ENABLE_NETGEN)
     add_subdirectory(contrib/Netgen)
     include_directories(contrib/Netgen contrib/Netgen/libsrc/include 
@@ -644,6 +646,18 @@ if(ENABLE_MED OR ENABLE_CGNS)
   endif(HDF5_LIB)
 endif(ENABLE_MED OR ENABLE_CGNS)
 
+if(HAVE_SOLVER)
+  if(ENABLE_GMM)
+    find_path(GMM_INC "gmm.h" PATH_SUFFIXES src include include/gmm)
+    if(GMM_INC)
+      list(APPEND EXTERNAL_INCLUDES ${GMM_INC})
+    else(GMM_INC)
+      message(STATUS "System GMM not found - using contrib/gmm instead")
+      include_directories(contrib/gmm)
+    endif(GMM_INC)
+    set_config_option(HAVE_GMM "Gmm")
+  endif(ENABLE_GMM)
+
   if(ENABLE_TAUCS)
     if(NOT HAVE_METIS)
       message(SEND_ERROR "You have to enable METIS in order to use TAUCS")
@@ -760,6 +774,7 @@ if(ENABLE_PETSC)
        message("WARNING: Export PETSC_ARCH before calling cmake")
     endif(NOT HAVE_PETSC AND NOT ENV_PETSC_ARCH)
   endif(ENABLE_PETSC)
+endif(HAVE_SOLVER)
 
 if(ENABLE_OCC)
   if(WIN32 OR CYGWIN)
@@ -837,14 +852,6 @@ if(ENABLE_ACIS)
   endif(ACIS_LIB)
 endif(ENABLE_ACIS)
 
-if(ENABLE_OSMESA)
-  find_library(OSMESA_LIB OSMesa)
-  if(OSMESA_LIB)
-    set_config_option(HAVE_OSMESA "OSMesa")
-    list(APPEND EXTERNAL_LIBRARIES ${OSMESA_LIB})
-  endif(OSMESA_LIB)
-endif(ENABLE_OSMESA)
-
 if(ENABLE_ONELAB)
   set_config_option(HAVE_ONELAB "OneLab")
 endif(ENABLE_ONELAB)