Adaptative maintenance of GEOM for new SalomePyConsole.

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index b83b3e77e30da171467a31beb1753d5d0fb24763..54cba56c350ef7d98f44ded0e821a449898d7416 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
@@ -25,7 +25,7 @@
 //  Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 
 #ifndef DISABLE_PYCONSOLE
-#include <PyConsole_Console.h>
+#include <SalomePyConsole_Console.h>
 #endif
 
 #include "GEOMToolsGUI.h"
@@ -135,7 +135,7 @@ void GEOMToolsGUI::OnCheckGeometry()
 {
   SalomeApp_Application* app =
     dynamic_cast< SalomeApp_Application* >(SUIT_Session::session()->activeApplication());
-  PyConsole_Console* pyConsole = app->pythonConsole();
+  SalomePyConsole_Console* pyConsole = app->pythonConsole();
 
   if (pyConsole)
     pyConsole->exec("from GEOM_usinggeom import *");

diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt
index e66da770b9a4c3b83897f14b48fb9655e56c93b9..82c65ac980e2853168a4d2dff55e48326ad8db8f 100755 (executable)
--- a/src/OCC2VTK/CMakeLists.txt
+++ b/src/OCC2VTK/CMakeLists.txt
@@ -35,7 +35,6 @@ ADD_DEFINITIONS(
 
 # libraries to link to
 SET(_link_LIBRARIES
-  vtkFiltersCore
   ${CAS_KERNEL} 
   ${CAS_TKMesh} ${CAS_TKTopAlgo}
   ${CAS_MODELER}