Minor bug fix.

[modules/gui.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe69daed10e8d361f0a997d65e9eb847dd88e881..54e4e19ad5386e60b806027dd0761ad9ab41906d 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,142 +21,109 @@
 # Common packages
 ##
 SET(SUBDIRS_COMMON
-  CASCatch
-  Qtx
-  Style
-  DDS
-  QDS
-  ObjBrowser
-  SUIT
-  SUITApp
-  STD
-  CAF
-  CAM
-  LogWindow
-  Prs
-  Event
-  OpenGLUtils
-  GUI_PY
+  CASCatch Qtx HelpBrowser Style DDS QDS ObjBrowser SUIT SUITApp STD CAF
+  CAM LogWindow Prs Event OpenGLUtils ViewerData ViewerTools ImageComposer GUI_PY
 )
 
 ##
 # SALOME object
 ##
-IF(ENABLE_SALOMEOBJECT)
+IF(SALOME_USE_SALOMEOBJECT)
   SET(SUBDIRS_OBJECT OBJECT)
-ENDIF(ENABLE_SALOMEOBJECT)
+ENDIF(SALOME_USE_SALOMEOBJECT)
 
 ##
 # GL viewer
 ##
-IF(ENABLE_GLVIEWER)
+IF(SALOME_USE_GLVIEWER)
   SET(SUBDIRS_GLVIEWER GLViewer)
-ENDIF(ENABLE_GLVIEWER)
+ENDIF(SALOME_USE_GLVIEWER)
 
 ##
 # VTK viewer
 ##
-IF(ENABLE_VTKVIEWER)
+IF(SALOME_USE_VTKVIEWER)
   SET(SUBDIRS_VTKVIEWER VTKViewer)
 
-  IF(ENABLE_SALOMEOBJECT)
-    SET(SUBDIRS_VTKVIEWER ${SUBDIRS_VTKVIEWER} SVTK)
-    SET(SUBDIRS_VIEWERTOOLSViewerTools)
-  ENDIF(ENABLE_SALOMEOBJECT)
-ENDIF(ENABLE_VTKVIEWER)
+  IF(SALOME_USE_SALOMEOBJECT)
+    LIST(APPEND SUBDIRS_VTKVIEWER SVTK)
+  ENDIF(SALOME_USE_SALOMEOBJECT)
+ENDIF(SALOME_USE_VTKVIEWER)
 
 ##
 # OCC viewer
 ##
-IF(ENABLE_OCCVIEWER)
+IF(SALOME_USE_OCCVIEWER)
   SET(SUBDIRS_OCCVIEWER OCCViewer)
-  SET(SUBDIRS_VIEWERTOOLS ViewerTools)
   
-  IF(ENABLE_SALOMEOBJECT)
-    SET(SUBDIRS_OCCVIEWER ${SUBDIRS_OCCVIEWER} SOCC)
-  ENDIF(ENABLE_SALOMEOBJECT)
-ENDIF(ENABLE_OCCVIEWER)
+  IF(SALOME_USE_SALOMEOBJECT)
+    LIST(APPEND SUBDIRS_OCCVIEWER SOCC)
+  ENDIF(SALOME_USE_SALOMEOBJECT)
+ENDIF(SALOME_USE_OCCVIEWER)
 
 ##
 # Plot2d viewer
 ##
-IF(ENABLE_PLOT2DVIEWER)
-  SET(SUBDIRS_PLOT2DVIEWER  Plot2d)
+IF(SALOME_USE_PLOT2DVIEWER)
+  SET(SUBDIRS_PLOT2DVIEWER Plot2d)
 
-  IF(ENABLE_SALOMEOBJECT)
-    SET(SUBDIRS_PLOT2DVIEWER ${SUBDIRS_PLOT2DVIEWER} SPlot2d)
-  ENDIF(ENABLE_SALOMEOBJECT)
-ENDIF(ENABLE_PLOT2DVIEWER)
-
-##
-# SUPERV graph viewer
-##
-IF(ENABLE_SUPERVGRAPHVIEWER) 
-  SET(SUBDIRS_SUPERVGRAPHVIEWER SUPERVGraph)
-ENDIF(ENABLE_SUPERVGRAPHVIEWER)
+  IF(SALOME_USE_SALOMEOBJECT)
+    LIST(APPEND SUBDIRS_PLOT2DVIEWER SPlot2d)
+  ENDIF(SALOME_USE_SALOMEOBJECT)
+ENDIF(SALOME_USE_PLOT2DVIEWER)
 
 ##
 # Qx scene viewer
 ##
-###VSR: QxGraph has been replaced by QxScene
-###SUBDIRS_QXGRAPHVIEWER = QxGraph
-IF(ENABLE_QXGRAPHVIEWER)
+IF(SALOME_USE_QXGRAPHVIEWER)
   SET(SUBDIRS_QXGRAPHVIEWER QxScene)
-ENDIF(ENABLE_QXGRAPHVIEWER)
+ENDIF(SALOME_USE_QXGRAPHVIEWER)
+
+# Graphics viewer
+##
+IF(SALOME_USE_GRAPHICSVIEW)
+  SET(SUBDIRS_GRAPHICSVIEW GraphicsView)
+ENDIF(SALOME_USE_GRAPHICSVIEW)
 
 ##
-# Python console (base)
+# Python-based packages
 ##
-IF(ENABLE_PYCONSOLE) 
+IF(SALOME_USE_PYCONSOLE) 
   SET(SUBDIRS_PYCONSOLE PyInterp PyConsole)
-ENDIF(ENABLE_PYCONSOLE)
+  SET(SUBDIRS_PYTHON SALOME_PYQT)
+  IF(SALOME_USE_VTKVIEWER)
+    LIST(APPEND SUBDIRS_PYTHON SALOME_PY)
+  ENDIF()
+  IF(SALOME_USE_SALOMEOBJECT)
+    LIST(APPEND SUBDIRS_PYTHON SALOME_SWIG)
+  ENDIF()
+ENDIF(SALOME_USE_PYCONSOLE)
 
 ##
 # Light SALOME packages
 ##
-SET(SUBDIRS_LIGHT
-  LightApp
-  ResExporter
-)
+SET(SUBDIRS_LIGHT LightApp ResExporter)
 
 ##
 # Full (CORBA) SALOME packages
 ##
-IF(GUI_ENABLE_CORBA)
-  SET(SUBDIRS_CORBA
-    TOOLSGUI
-    Session
-    SalomeApp
-    GuiHelpers
-    TreeData
-  )
-ENDIF(GUI_ENABLE_CORBA)
-
-##
-# Extra Python packages
-##
-IF(ENABLE_PYCONSOLE)
-  SET(SUBDIRS_PY_LIGHT
-    SALOME_SWIG
-    SALOME_PY
-    SALOME_PYQT
-  )
-ENDIF(ENABLE_PYCONSOLE)
+IF(NOT SALOME_LIGHT_ONLY)
+  SET(SUBDIRS_CORBA TOOLSGUI SalomeApp Session GuiHelpers TreeData)
+ENDIF(NOT SALOME_LIGHT_ONLY)
 
 SET(SUBDIRS
   ${SUBDIRS_COMMON}
   ${SUBDIRS_OBJECT}
-  ${SUBDIRS_VIEWERTOOLS}
   ${SUBDIRS_GLVIEWER}
   ${SUBDIRS_VTKVIEWER}
   ${SUBDIRS_OCCVIEWER}
   ${SUBDIRS_PLOT2DVIEWER}
-  ${SUBDIRS_SUPERVGRAPHVIEWER}
   ${SUBDIRS_QXGRAPHVIEWER}
+  ${SUBDIRS_GRAPHICSVIEW}
   ${SUBDIRS_PYCONSOLE}
   ${SUBDIRS_LIGHT}
   ${SUBDIRS_CORBA}
-  ${SUBDIRS_PY_LIGHT}
+  ${SUBDIRS_PYTHON}
 )
 
 FOREACH(dir ${SUBDIRS})