Merge changes from 'master' branch.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86c9ce7b692c37ef2b9a1eedb2e4f1bc8bf589a4..907798d2e1ba60eb7f2789784c024ab4ca75cd28 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
@@ -22,7 +22,9 @@
 ##
 ADD_SUBDIRECTORY(CASCatch)
 ADD_SUBDIRECTORY(Qtx)
-ADD_SUBDIRECTORY(HelpBrowser)
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
+  ADD_SUBDIRECTORY(HelpBrowser)
+ENDIF()
 ADD_SUBDIRECTORY(Style)
 ADD_SUBDIRECTORY(DDS)
 ADD_SUBDIRECTORY(QDS)
@@ -107,31 +109,28 @@ ENDIF(SALOME_USE_GRAPHICSVIEW)
 # ParaView Viewer
 IF(SALOME_USE_PVVIEWER)
   ADD_SUBDIRECTORY(PVViewer)
+  ADD_SUBDIRECTORY(PVServerService)
 ENDIF()
 
 ##
 # Python Viewer
 ##
 IF(SALOME_USE_PYVIEWER)
-  ADD_SUBDIRECTORY(PyEditor)
   ADD_SUBDIRECTORY(PyViewer)
 ENDIF(SALOME_USE_PYVIEWER)
 
-
 ##
 # Python-based packages, part 1 (generic)
 ##
-IF(SALOME_USE_PYCONSOLE) 
-  ADD_SUBDIRECTORY(PyInterp)
-  ADD_SUBDIRECTORY(PyConsole)
+IF(SALOME_USE_PYCONSOLE)
   ADD_SUBDIRECTORY(SALOME_PYQT)
 ENDIF(SALOME_USE_PYCONSOLE)
 
+
 ##
 # Light SALOME packages
 ##
 ADD_SUBDIRECTORY(LightApp)
-ADD_SUBDIRECTORY(ResExporter)
 
 ##
 # Python-based packages, part 2 (LightApp-dependent)
@@ -142,7 +141,7 @@ IF(SALOME_USE_PYCONSOLE)
   ENDIF(SALOME_USE_VTKVIEWER)
   IF(SALOME_USE_SALOMEOBJECT)
     ADD_SUBDIRECTORY(SALOME_SWIG)
-  ENDIF(SALOME_USE_VTKVIEWER)
+  ENDIF(SALOME_USE_SALOMEOBJECT)
 ENDIF(SALOME_USE_PYCONSOLE)
 
 ##