Merge from V6_main 28/02/2013

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe69daed10e8d361f0a997d65e9eb847dd88e881..414071e09b7655e55d6105e13ac3a1061a3b1b8a 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,74 +42,74 @@ SET(SUBDIRS_COMMON
 ##
 # 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)
+  IF(SALOME_USE_SALOMEOBJECT)
     SET(SUBDIRS_VTKVIEWER ${SUBDIRS_VTKVIEWER} SVTK)
     SET(SUBDIRS_VIEWERTOOLSViewerTools)
-  ENDIF(ENABLE_SALOMEOBJECT)
-ENDIF(ENABLE_VTKVIEWER)
+  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)
+  IF(SALOME_USE_SALOMEOBJECT)
     SET(SUBDIRS_OCCVIEWER ${SUBDIRS_OCCVIEWER} SOCC)
-  ENDIF(ENABLE_SALOMEOBJECT)
-ENDIF(ENABLE_OCCVIEWER)
+  ENDIF(SALOME_USE_SALOMEOBJECT)
+ENDIF(SALOME_USE_OCCVIEWER)
 
 ##
 # Plot2d viewer
 ##
-IF(ENABLE_PLOT2DVIEWER)
+IF(SALOME_USE_PLOT2DVIEWER)
   SET(SUBDIRS_PLOT2DVIEWER  Plot2d)
 
-  IF(ENABLE_SALOMEOBJECT)
+  IF(SALOME_USE_SALOMEOBJECT)
     SET(SUBDIRS_PLOT2DVIEWER ${SUBDIRS_PLOT2DVIEWER} SPlot2d)
-  ENDIF(ENABLE_SALOMEOBJECT)
-ENDIF(ENABLE_PLOT2DVIEWER)
+  ENDIF(SALOME_USE_SALOMEOBJECT)
+ENDIF(SALOME_USE_PLOT2DVIEWER)
 
 ##
 # SUPERV graph viewer
 ##
-IF(ENABLE_SUPERVGRAPHVIEWER) 
+IF(SALOME_USE_SUPERVGRAPHVIEWER) 
   SET(SUBDIRS_SUPERVGRAPHVIEWER SUPERVGraph)
-ENDIF(ENABLE_SUPERVGRAPHVIEWER)
+ENDIF(SALOME_USE_SUPERVGRAPHVIEWER)
 
 ##
 # 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)
 
 ##
 # Python console (base)
 ##
-IF(ENABLE_PYCONSOLE) 
+IF(SALOME_USE_PYCONSOLE) 
   SET(SUBDIRS_PYCONSOLE PyInterp PyConsole)
-ENDIF(ENABLE_PYCONSOLE)
+ENDIF(SALOME_USE_PYCONSOLE)
 
 ##
 # Light SALOME packages
@@ -122,7 +122,7 @@ SET(SUBDIRS_LIGHT
 ##
 # Full (CORBA) SALOME packages
 ##
-IF(GUI_ENABLE_CORBA)
+IF(SALOME_USE_CORBA)
   SET(SUBDIRS_CORBA
     TOOLSGUI
     Session
@@ -130,18 +130,18 @@ IF(GUI_ENABLE_CORBA)
     GuiHelpers
     TreeData
   )
-ENDIF(GUI_ENABLE_CORBA)
+ENDIF(SALOME_USE_CORBA)
 
 ##
 # Extra Python packages
 ##
-IF(ENABLE_PYCONSOLE)
+IF(SALOME_USE_PYCONSOLE)
   SET(SUBDIRS_PY_LIGHT
     SALOME_SWIG
     SALOME_PY
     SALOME_PYQT
   )
-ENDIF(ENABLE_PYCONSOLE)
+ENDIF(SALOME_USE_PYCONSOLE)
 
 SET(SUBDIRS
   ${SUBDIRS_COMMON}