From 35d236aa65f478b7b6737f799124df21fc1271dd Mon Sep 17 00:00:00 2001 From: DUC ANH HOANG Date: Tue, 16 Jan 2024 11:46:55 +0100 Subject: [PATCH] remove SalomeOnDemandTK --- bin/CMakeLists.txt | 1 - bin/runSalome.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index d1abff409..924ee727f 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -18,7 +18,6 @@ # ADD_SUBDIRECTORY(appliskel) -ADD_SUBDIRECTORY(SalomeOnDemandTK) SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) SALOME_CONFIGURE_FILE(salomeContextUtils.py.in salomeContextUtils.py) diff --git a/bin/runSalome.py b/bin/runSalome.py index 8824d5381..e5b6e29b9 100755 --- a/bin/runSalome.py +++ b/bin/runSalome.py @@ -32,7 +32,6 @@ from salomeContextUtils import ScriptAndArgsObjectEncoder import runSalomeNoServer import runSalomeCommon import platform -import runSalomeOnDemand from launchConfigureParser import verbosity_nam, on_demand_nam import logging logger = logging.getLogger() @@ -183,6 +182,7 @@ def main(exeName=None): # Setup extension's env in salome on demand case if args[on_demand_nam]: + import runSalomeOnDemand runSalomeOnDemand.set_ext_env() # Reset up module_list and modules_root_dir, if we dont want to define SalomeAppConfig on salome.py. # We must remove the "else" on "if os.sys.platform == 'win32':" in launcheConfigureParser.py too. -- 2.39.2