From 158b815b98c0f185caf2cebbff72578b0e4c509f Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 22 Nov 2011 07:20:30 +0000 Subject: [PATCH] Fix compilation problem (caused by merge of PPGP development) --- src/wrappers/BL_MainWindows_SALOME.cxx | 4 +++- src/wrappers/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wrappers/BL_MainWindows_SALOME.cxx b/src/wrappers/BL_MainWindows_SALOME.cxx index 5827751..7caf0cc 100644 --- a/src/wrappers/BL_MainWindows_SALOME.cxx +++ b/src/wrappers/BL_MainWindows_SALOME.cxx @@ -18,6 +18,7 @@ // #include "BL_MainWindows_SALOME.hxx" +#include 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 diff --git a/src/wrappers/Makefile.am b/src/wrappers/Makefile.am index e741f90..a920d58 100644 --- a/src/wrappers/Makefile.am +++ b/src/wrappers/Makefile.am @@ -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 -- 2.39.2