From: azv <azv@opencascade.com>
Date: Tue, 22 Dec 2015 14:49:42 +0000 (+0300)
Subject: Update environment to compile PlaneGCS solver on Windows
X-Git-Tag: V_2.1.0~104
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5fcae986cb44da30e664f678927ab21bafea6baa;p=modules%2Fshaper.git

Update environment to compile PlaneGCS solver on Windows
---

diff --git a/env_Salome.bat b/env_Salome.bat
index c20699bd4..9de52650f 100644
--- a/env_Salome.bat
+++ b/env_Salome.bat
@@ -33,7 +33,11 @@ if "%EIGEN_ROOT_DIR%" == "" (
 )
 
 if "%BOOST_ROOT_DIR%" == "" (
-  SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+  if "SALOME_ROOT_DIR" == "" (
+    SET BOOST_ROOT_DIR=%ROOT_DIR%\products\boost-1.52.0
+  ) else (
+    SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+  )
 )
 
 cd %SALOME_ROOT_DIR%\WORK
diff --git a/msvc10_env.bat b/msvc10_env.bat
index 0d63c8b4f..d186a5199 100644
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -133,7 +133,11 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 
 @REM -------------------------
+@IF "%SALOME_ROOT_DIR%" == "" (
 @SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0
+) ELSE (
+@SET BOOST_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\boost-1.52.0
+)
 @REM -------------------------
 
 @REM -------------------------