ParaGEOMCorba, ParaSMESHCorba, ParaMEDCorba plugins: remove unnecessary dependency...

diff --git a/src/Plugins/ParaGEOMCorba/CMakeLists.txt b/src/Plugins/ParaGEOMCorba/CMakeLists.txt
index 740c0a78cf767df8d07ca8f068e08a7e2b775a18..56856f752361b3a667a7fc5b7a82b4da8aa0d7a9 100644 (file)
--- a/src/Plugins/ParaGEOMCorba/CMakeLists.txt
+++ b/src/Plugins/ParaGEOMCorba/CMakeLists.txt
@@ -38,8 +38,9 @@ PROJECT( ParaGEOMCorba )
     TARGET_LINK_LIBRARIES(ParaGEOMCorbaPlugin
       ${OMNIORB_LIBRARIES}
       ${KERNEL_SalomeIDLKernel}
-      ${GUI_SalomeApp}
-         ${GEOM_GEOMClient}
+      ${KERNEL_SalomeLifeCycleCORBA}
+      ${KERNEL_SalomeNS}
+      ${GEOM_GEOMClient}
       ${GEOM_SalomeIDLGEOM}
       ${GEOM_OCC2VTK}
   )

diff --git a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
index 5ae91c17cb8caad24f0a124122c0df39db7f5693..16061781bc7454aaecdf4541afb99e6ec1c76bae 100644 (file)
--- a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
+++ b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx
@@ -28,9 +28,9 @@
 #include "vtkInformation.h"
 
 #include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOME_NamingService.hxx>
 #include <TopoDS_Shape.hxx>
 #include "vtkPolyData.h"
-#include <SalomeApp_Application.h>
 #include "GEOM_Gen.hh"
 #include "GEOM_Client.hxx"
 #include "OCC2VTK_Tools.h"
@@ -108,7 +108,8 @@ int vtkParaGEOMCorbaSource::RequestData(vtkInformation* request, vtkInformationV
     GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow(obj);
     
     if(!CORBA::is_nil(geomObj)) {
-      SALOME_LifeCycleCORBA aLCC(SalomeApp_Application::namingService());
+      SALOME_NamingService ns(*OrbC);
+      SALOME_LifeCycleCORBA aLCC(&ns);
       Engines::EngineComponent_var aComponent = aLCC.FindOrLoad_Component("FactoryServer","GEOM");
       GEOM::GEOM_Gen_var geomGen = GEOM::GEOM_Gen::_narrow(aComponent);
       if ( !CORBA::is_nil( geomGen ) ) {

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 96880ae4a379a382e179d85757760d86907fa4d0..11ca52fa7011a9be3d705b9c65c7bd50d953aa3f 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -65,7 +65,6 @@ PROJECT( ParaMEDCorba )
       ${OMNIORB_LIBRARIES}
       ${MED_SalomeIDLMED}
       ${KERNEL_SalomeIDLKernel}
-      ${QT_LIBRARIES}
       )
     TARGET_LINK_LIBRARIES(ParaMEDCorbaPlugin
       ParaMEDMEM2VTK

diff --git a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx
index 315aa1f7bd8807fb6a30d2e4ece5affa0aae6241..9d0ff02d8a13ef2a8e70b77433048abd4d37f802 100644 (file)
--- a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx
+++ b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx
@@ -20,7 +20,6 @@
 #include "vtkParaSMESHCorbaSource.h"
 
 #include <SALOME_LifeCycleCORBA.hxx>
-#include <SalomeApp_Application.h>
 
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkInformationVector.h"