CMake improvement: usage of SALOME_GUI_MODE() macro

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22c4bfb660a5cd78c5e510abfc13f9f67840db33..b9a3fe69bb9ed7928d11e919ab822e6f40aa7202 100644 (file)
--- 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 e2ec40981103039a06923c4f0f519afd3c16d405..35755f4085358bcf2c93c0a2eff69f9726a65fe4 100644 (file)
--- 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 f38ac61532d62482d6690ffbb116f1a239d9bc96..128736431c0b04df0541ec1db4ac5a444efa9f13 100644 (file)
--- 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 0eca4e9c2827f11af87e31490eca9fb53d484f85..ba47ba8cbcc4cbf739f64da53daae54e2e85d694 100644 (file)
--- 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 534e4103553bb45e7c2c661a579742f9d69e85a0..8399e531d053cfc723105c08a76194c3d4491563 100644 (file)
--- 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}