SHAPER for no servers launch mode.

diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt
index 551dd96d06b4104e63a8e99caf331a96339ba1a2..18e2a19d45af6eae084fd1f326eebbf595ec0673 100644 (file)
--- a/src/SHAPERGUI/CMakeLists.txt
+++ b/src/SHAPERGUI/CMakeLists.txt
@@ -139,4 +139,5 @@ CONFIGURE_FILE(
 install(TARGETS shapergui_app DESTINATION ${SHAPER_INSTALL_EXE})
 INSTALL(TARGETS SHAPER DESTINATION ${SHAPER_INSTALL_BIN})
 INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION ${SHAPER_INSTALL_RESOURCES})
+install(FILES resources/SalomeApp.xml RENAME SalomeAppSL.xml DESTINATION ${SHAPER_INSTALL_RESOURCES})
 INSTALL(FILES ${QM_RESOURCES} DESTINATION ${SHAPER_INSTALL_QM_RESOURCES})

diff --git a/src/SHAPERGUI/shapergui_app.cpp b/src/SHAPERGUI/shapergui_app.cpp
index 4c9d4739b7672a74284deab0bfdd762f24bbb2e0..a9a2bc6f0d5f3d937f66087139861e773dd3566f 100644 (file)
--- a/src/SHAPERGUI/shapergui_app.cpp
+++ b/src/SHAPERGUI/shapergui_app.cpp
@@ -43,8 +43,8 @@ int main(int argc, char *argv[])
   QString gui_root_dir( QDir::fromNativeSeparators(pe.value(GUI_ROOT_DIR)) );
   QString shaper_root_dir( QDir::fromNativeSeparators(pe.value(SHAPER_ROOT_DIR)) );
   QString lightappconfig_val( QString("%1:%2")
-  .arg(QDir::toNativeSeparators(QString("%1/share/salome/resources/gui").arg(gui_root_dir)))
-  .arg(QDir::toNativeSeparators(QString("%1/share/salome/resources/shaper").arg(shaper_root_dir))));
+  .arg( QDir::toNativeSeparators( QString("%1/share/salome/resources/gui").arg(gui_root_dir) ) )
+  .arg( QDir::toNativeSeparators( QString("%1/share/salome/resources/shaper").arg(shaper_root_dir) ) ) );
   pe.insert(LIGHTAPPCONFIG,lightappconfig_val);
   //tells shutup to salome.salome_init invoked at shaper engine ignition
   pe.insert("SALOME_EMB_SERVANT","1");