Update environment to compile PlaneGCS solver on Windows

diff --git a/env_Salome.bat b/env_Salome.bat
index c20699bd4402a72738efc2a304b8b50571688d3f..9de52650f137e89bb52f21993b9a3a8dbf6fc472 100644 (file)
--- 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 0d63c8b4fc5be5776b76356322611cc37b2590f4..d186a51994514ce69edb51b230c621e016bfa4dd 100644 (file)
--- 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 -------------------------