From: vsv Date: Tue, 17 Dec 2019 10:33:57 +0000 (+0300) Subject: Provide launch environment for SMESH module X-Git-Tag: V9_5_0a1~17^2~17 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2cd7abc9ef2c15474f4fc1c6b8011a1fbcbba3b4;p=modules%2Fshaper.git Provide launch environment for SMESH module --- diff --git a/build_Salome_deb.bat b/build_Salome_deb.bat index a65baa442..9ab127ec1 100644 --- a/build_Salome_deb.bat +++ b/build_Salome_deb.bat @@ -10,7 +10,7 @@ popd @SET SRC_DIR=%ROOT_DIR%\sources @SET OCC_LIB_PREFIX=d -call %SRC_DIR%\env_Salome.bat d +call %SRC_DIR%\env_Salome.bat d comp mkdir %ROOT_DIR%\build cd %ROOT_DIR%\build diff --git a/env_Salome.bat b/env_Salome.bat index 797be6453..708f5f6ea 100644 --- a/env_Salome.bat +++ b/env_Salome.bat @@ -40,7 +40,13 @@ if "%BOOST_ROOT_DIR%" == "" ( cd /d %SALOME_ROOT_DIR%\WORK call set_env.bat %1 -call "%PDIR%\env_launch.bat" + +if %2 == "run" ( + call "%PDIR%\env_launch.bat" +) else ( + call "%PDIR%\env_compile.bat" +) + cd /d %ROOT_DIR% @REM ------------------------- diff --git a/salomeRun_deb.bat b/salomeRun_deb.bat index 14b69a6ba..be74b9812 100644 --- a/salomeRun_deb.bat +++ b/salomeRun_deb.bat @@ -8,7 +8,7 @@ pushd %PARENT_DIR% popd @SET OCC_LIB_PREFIX=d -call env_Salome.bat d +call env_Salome.bat d run @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install @SET SalomeAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui