From afc623bda037b27145f8679ce453b4f766e3e925 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 20 Jun 2017 12:09:38 +0300 Subject: [PATCH] ParaGEOMCorba, ParaSMESHCorba, ParaMEDCorba plugins: remove unnecessary dependency on Qt/SALOME GUI libs. --- src/Plugins/ParaGEOMCorba/CMakeLists.txt | 5 +++-- src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx | 5 +++-- src/Plugins/ParaMEDCorba/CMakeLists.txt | 1 - src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Plugins/ParaGEOMCorba/CMakeLists.txt b/src/Plugins/ParaGEOMCorba/CMakeLists.txt index 740c0a78..56856f75 100644 --- 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 5ae91c17..16061781 100644 --- a/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx +++ b/src/Plugins/ParaGEOMCorba/vtkParaGEOMCorbaSource.cxx @@ -28,9 +28,9 @@ #include "vtkInformation.h" #include +#include #include #include "vtkPolyData.h" -#include #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 96880ae4..11ca52fa 100644 --- 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 315aa1f7..9d0ff02d 100644 --- a/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx +++ b/src/Plugins/ParaSMESHCorba/vtkParaSMESHCorbaSource.cxx @@ -20,7 +20,6 @@ #include "vtkParaSMESHCorbaSource.h" #include -#include #include "vtkStreamingDemandDrivenPipeline.h" #include "vtkInformationVector.h" -- 2.39.2