Merge changes from 'master' branch.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 17fd52a98ec29b5b600856a60a7bbac6226d006a..907798d2e1ba60eb7f2789784c024ab4ca75cd28 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
@@ -114,20 +116,17 @@ 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
 ##