From: mpa <mpa@opencascade.com>
Date: Thu, 11 Jun 2015 13:26:00 +0000 (+0300)
Subject: CMake improvement: usage of SALOME_GUI_MODE() macro
X-Git-Tag: V7_7_0a1~12
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6d8bd41fbd1886c00525b5205b9fe5a5e49bda77;p=modules%2Fparavis.git

CMake improvement: usage of SALOME_GUI_MODE() macro
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22c4bfb6..b9a3fe69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,8 @@ FIND_PACKAGE(SalomeParaView REQUIRED)
 # GUI itself has to be loaded AFTER ParaView: the ParaView config doesn't mix
 # well with the VTK one (and GUI loads VTK):
 FIND_PACKAGE(SalomeGUI REQUIRED)
-FULL_GUI(TRUE) # check whether GUI builded in full mode and with CORBA
+SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
+SALOME_GUI_MODE(SALOME_USE_SALOMEOBJECT SALOME_USE_PVVIEWER)
 ADD_DEFINITIONS(${GUI_DEFINITIONS})
 INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS})
 
diff --git a/SalomePARAVISConfig.cmake.in b/SalomePARAVISConfig.cmake.in
index e2ec4098..35755f40 100644
--- a/SalomePARAVISConfig.cmake.in
+++ b/SalomePARAVISConfig.cmake.in
@@ -54,11 +54,6 @@ SET(SALOME_PARAVIS_LIGHT_ONLY  @SALOME_LIGHT_ONLY@)
 SET(SALOME_PARAVIS_USE_GEOM_SOURCE  @SALOME_PARAVIS_USE_GEOM_SOURCE@)
 SET(SALOME_PARAVIS_USE_SMESH_SOURCE  @SALOME_PARAVIS_USE_SMESH_SOURCE@)
 
-# Advanced options
-SET(SALOME_USE_OCCVIEWER    @SALOME_USE_OCCVIEWER@)
-SET(SALOME_USE_GLVIEWER     @SALOME_USE_GLVIEWER@)
-SET(SALOME_USE_VTKVIEWER    @SALOME_USE_VTKVIEWER@)
-SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@)
 
 # Level 1 prerequisites:
 SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index f38ac615..12873643 100644
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -49,7 +49,7 @@ SET(_link_LIBRARIES
   ${PYTHON_LIBS}
   ${KERNEL_LDFLAGS}
   ${GUI_LDFLAGS} ${GUI_LightApp} ${GUI_CAM} ${GUI_qtx} ${GUI_suit}
-                 ${GUI_SalomeObject} ${GUI_vtkTools}
+                 ${GUI_SalomeObject}
   ${_PARAVIEW_APP_COMPO_LIB}
   ${GUI_PVViewer}
 )
diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index 0eca4e9c..ba47ba8c 100644
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@ -442,7 +442,9 @@ void PVGUI_Module::updateMacros()
 void PVGUI_Module::windows( QMap<int, int>& m ) const
 {
   m.insert( LightApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+#ifndef DISABLE_PYCONSOLE
   m.insert( LightApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
+#endif
   // ParaView diagnostic output redirected here
   m.insert( LightApp_Application::WT_LogWindow, Qt::BottomDockWidgetArea );
 }
diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 534e4103..8399e531 100644
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -57,7 +57,6 @@ PROJECT( ParaMEDCorba )
       #vtkGraphics
       vtkClientServer
       vtkPVVTKExtensionsRendering
-      VTKViewer
       pqCore
       ${OMNIORB_LIBRARIES}
       ${MED_SalomeIDLMED}