]> SALOME platform Git repositories - modules/jobmanager.git/commitdiff
Salome HOME
Fix compilation problem (caused by merge of PPGP development)
authorvsr <vsr@opencascade.com>
Tue, 22 Nov 2011 07:20:30 +0000 (07:20 +0000)
committervsr <vsr@opencascade.com>
Tue, 22 Nov 2011 07:20:30 +0000 (07:20 +0000)
src/wrappers/BL_MainWindows_SALOME.cxx
src/wrappers/Makefile.am

index 58277512b5effcd92ecef8118d20149828125ef5..7caf0cc86812bdee08b1a06187547e6a15da88f9 100644 (file)
@@ -18,6 +18,7 @@
 //
 
 #include "BL_MainWindows_SALOME.hxx"
+#include <SalomeApp_Engine_i.hxx>
 
 BL::MainWindows_SALOME::MainWindows_SALOME(const QString & module_name) :
   SalomeApp_Module(module_name),
@@ -87,7 +88,8 @@ QString
 BL::MainWindows_SALOME::engineIOR() const
 {
   DEBTRACE("Entering in BL::SalomeGui::engineIOR");
-  return _appli->defaultEngineIOR();
+  QString anEngineIOR = SalomeApp_Engine_i::EngineIORForComponent( "JOBMANAGER", true ).c_str();
+  return anEngineIOR;
 }
 
 void 
index e741f90b38f423bb0fd9f4878b2d4dc8f84d2951..a920d58bbb21b363d745bef71468ec6ce6c6466b 100644 (file)
@@ -51,5 +51,5 @@ libBL_Wrappers_SALOME_la_CXXFLAGS = $(qt4_cppflags) -I$(top_srcdir)/src/bases \
 libBL_Wrappers_SALOME_la_LDFLAGS = $(qt4_ldflags) 
 
 libBL_Wrappers_SALOME_la_LIBADD = -lQtGui -lQtCore $(top_builddir)/src/bases/libBL_Bases.la $(OMNIORB_LIBS) \
-                                 $(KERNEL_LDFLAGS) -lSalomeIDLKernel $(GUI_LDFLAGS) -lLightApp -lSalomeApp -lCAM -lsuit
+                                 $(KERNEL_LDFLAGS) -lSalomeIDLKernel $(GUI_LDFLAGS) -lLightApp -lSalomeApp -lSalomeSession -lCAM -lsuit