Adaptative maintenance of GEOM for new SalomePyConsole.

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index 5b4273c95d79eb549b4b12a5773092620e5f9a7a..069dac1cae25f40906f2bd7e876543477f122071 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 677b78e0e64a927967567a6fc1593a1e8aba35e7..76bb59882a905ee7b12da4f176f1664690409581 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}