Merge branch 'master' of ssh://git.salome-platform.org/modules/gui

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fa419361c4576b174ff32becca6d246c02c7dd13..3e0001ecaf2af45e9488830d86088a146a7e0fef 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  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,8 +21,8 @@
 # Common packages
 ##
 SET(SUBDIRS_COMMON
-  CASCatch Qtx Style DDS QDS ObjBrowser SUIT SUITApp STD CAF
-  CAM LogWindow Prs Event OpenGLUtils ViewerTools GUI_PY
+  CASCatch Qtx HelpBrowser Style DDS QDS ObjBrowser SUIT SUITApp STD CAF
+  CAM LogWindow Prs Event OpenGLUtils ViewerData ViewerTools ImageComposer GUI_PY
 )
 
 ##
@@ -79,12 +79,30 @@ IF(SALOME_USE_QXGRAPHVIEWER)
   SET(SUBDIRS_QXGRAPHVIEWER QxScene)
 ENDIF(SALOME_USE_QXGRAPHVIEWER)
 
+# Graphics viewer
+##
+IF(SALOME_USE_GRAPHICSVIEW)
+  SET(SUBDIRS_GRAPHICSVIEW GraphicsView)
+ENDIF(SALOME_USE_GRAPHICSVIEW)
+
+# ParaView Viewer
+IF(SALOME_USE_PVVIEWER)
+  SET(SUBDIRS_PVVIEWER PVViewer)
+ENDIF()
+
+
 ##
 # Python-based packages
 ##
 IF(SALOME_USE_PYCONSOLE) 
   SET(SUBDIRS_PYCONSOLE PyInterp PyConsole)
-  SET(SUBDIRS_PYTHON SALOME_SWIG SALOME_PY SALOME_PYQT)
+  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)
 
 ##
@@ -96,7 +114,7 @@ SET(SUBDIRS_LIGHT LightApp ResExporter)
 # Full (CORBA) SALOME packages
 ##
 IF(NOT SALOME_LIGHT_ONLY)
-  SET(SUBDIRS_CORBA TOOLSGUI Session SalomeApp GuiHelpers TreeData)
+  SET(SUBDIRS_CORBA TOOLSGUI SalomeApp Session GuiHelpers TreeData)
 ENDIF(NOT SALOME_LIGHT_ONLY)
 
 SET(SUBDIRS
@@ -107,6 +125,8 @@ SET(SUBDIRS
   ${SUBDIRS_OCCVIEWER}
   ${SUBDIRS_PLOT2DVIEWER}
   ${SUBDIRS_QXGRAPHVIEWER}
+  ${SUBDIRS_PVVIEWER}
+  ${SUBDIRS_GRAPHICSVIEW}
   ${SUBDIRS_PYCONSOLE}
   ${SUBDIRS_LIGHT}
   ${SUBDIRS_CORBA}