From 5fe34bb95a379f169be1f48331f16456672277ce Mon Sep 17 00:00:00 2001 From: Sergey Belash Date: Tue, 11 Mar 2014 11:44:55 +0400 Subject: [PATCH] Refactoring: INSTALL_DIR variable in env.bat renamed to ROOT_DIR --- env.bat | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/env.bat b/env.bat index f9429a84a..abf39c37f 100644 --- a/env.bat +++ b/env.bat @@ -1,21 +1,21 @@ @echo off @REM Load local settings from file localenv.bat that should be located in the root directory -if "%INSTALL_DIR%" == "" ( - set INSTALL_DIR=%~dp0.. +if "%ROOT_DIR%" == "" ( + set ROOT_DIR=%~dp0.. ) -if exist "%INSTALL_DIR%\localenv.bat" ( - echo Setting local environment from %INSTALL_DIR%\localenv.bat - call "%INSTALL_DIR%\localenv.bat" +if exist "%ROOT_DIR%\localenv.bat" ( + echo Setting local environment from %ROOT_DIR%\localenv.bat + call "%ROOT_DIR%\localenv.bat" ) else ( - echo Warning: file %INSTALL_DIR%\localenv.bat does not exist; using default environment + echo Warning: file %ROOT_DIR%\localenv.bat does not exist; using default environment ) rem --------------- Configuration -------------- rem --------------- Products path -------------- if "%PRODUCTSDIR%" == "" ( - set PRODUCTSDIR=%INSTALL_DIR%\PRODUCTS + set PRODUCTSDIR=%ROOT_DIR%\PRODUCTS ) rem --------------- cmake 2.8.7 -------------- @@ -29,6 +29,7 @@ set PATH=%CMAKEDIR%\bin;%PATH% @SET CAS_ROOT_DIR=%PRODUCTSDIR%\OCCT-6.7.0 @SET CASROOT=%CAS_ROOT_DIR% @REM ------------------------- + @REM ------------------------- @REM CASCADE @SET PATH=%CASROOT%;%CASROOT%\win32\bind;%PATH% -- 2.39.2