From 5fcae986cb44da30e664f678927ab21bafea6baa Mon Sep 17 00:00:00 2001 From: azv Date: Tue, 22 Dec 2015 17:49:42 +0300 Subject: [PATCH] Update environment to compile PlaneGCS solver on Windows --- env_Salome.bat | 6 +++++- msvc10_env.bat | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 ------------------------- -- 2.39.2