From a6cbe14a63cb087710c150883d57765c0ac5a5d3 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Thu, 11 Feb 2021 23:09:53 +0100 Subject: [PATCH] SHAPER for no servers launch mode. --- src/SHAPERGUI/CMakeLists.txt | 1 + src/SHAPERGUI/shapergui_app.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SHAPERGUI/CMakeLists.txt b/src/SHAPERGUI/CMakeLists.txt index 551dd96d0..18e2a19d4 100644 --- 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 4c9d4739b..a9a2bc6f0 100644 --- 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"); -- 2.39.2