ModelDocument test corrected to avoid SWIG/Python crash

[modules/shaper.git] / msvc10_env.bat

diff --git a/msvc10_env.bat b/msvc10_env.bat
index 41f21666cf7153e110bd6cd26e77ee086758fe78..5822d74684ba99233c2f0178300f2b4c5faf481b 100644 (file)
--- a/msvc10_env.bat
+++ b/msvc10_env.bat
@@ -26,7 +26,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @REM -------------------------
 @REM CASCADE
-@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.7.0
+@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.8.0
 @SET CASROOT=%CAS_ROOT_DIR%
 @REM -------------------------
 
@@ -81,7 +81,7 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @REM QT
 @SET QTDIR=%PDIR%\qt-4.8.4
-@ECHO -- Creating qt.conf... 
+@ECHO -- Creating qt.conf... in %QTDIR%
 @ECHO [Paths] > %QTDIR%/bin/qt.conf
 @ECHO Prefix = %QTDIR:\=/% >> %QTDIR%/bin/qt.conf
 @SET PATH=%QTDIR%\bin;%PATH%
@@ -91,10 +91,8 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @REM PYTHON
 @SET PYTHONHOME=%PDIR%\python-2.7.3
-@SET PYTHON_LIB_DIR=%PYTHONHOME%\libs
-@SET PYTHON_INC_DIR=%PYTHONHOME%\include
-@SET PATH=%PYTHON_LIB_DIR%;%PATH%
-@SET PATH=%PYTHONHOME%;%PATH%
+@SET PYTHON_INCLUDE=%PYTHONHOME%\include
+@SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH%
 @SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH%
 @SET PYTHONPATH=%PYTHONHOME%\DLLs;%PYTHONPATH%
 @SET PYTHON_VERSION=2.7
@@ -108,12 +106,8 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 @REM LIBXML2
 @SET LIBXML2_ROOT_DIR=%PDIR%\libxml2-2.9.0
-@REM DO NOT rename following 3 variables, 
-@REM they are required by CMake "find(Libxml2)" procedure
-@SET LIBXML2_INCLUDE_DIR=%LIBXML2_ROOT_DIR%\include\libxml2
-@SET LIBXML2_LIB_DIR=%LIBXML2_ROOT_DIR%\lib
-@SET LIBXML2_BIN_DIR=%LIBXML2_ROOT_DIR%\bin
-@SET PATH=%LIBXML2_BIN_DIR%;%LIBXML2_LIB_DIR%;%PATH%
+@SET PATH=%LIBXML2_ROOT_DIR%\lib;%PATH%
+@SET PATH=%LIBXML2_ROOT_DIR%\bin;%PATH%
 @REM -------------------------
 
 @REM -------------------------
@@ -122,8 +116,8 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 @REM -------------------------
 
 @REM BOOST
-@SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0
-@SET PATH=%BOOST_ROOT_DIR%\lib;%PATH%
+@REM @SET BOOST_ROOT_DIR=%PDIR%\boost-1.52.0
+@REM @SET PATH=%BOOST_ROOT_DIR%\lib;%PATH%
 @REM -------------------------
 
 @REM -------------------------
@@ -133,7 +127,13 @@ set PATH=%CMAKEDIR%\bin;%PATH%
 
 @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
 @SET PATH=%ROOT_DIR%\install\plugins;%ROOT_DIR%\install\bin;%PATH%
-@SET PYTHONPATH=%ROOT_DIR%\install\swig;%PYTHONPATH%
+@SET PYTHONPATH=%ROOT_DIR%\install\swig;%ROOT_DIR%\install\plugins;%PYTHONPATH%
+
+@REM -------------------------
+@REM PTHREAD
+@SET PATH=%PDIR%\pthreads-2.9.1\lib;%PATH%
+@REM -------------------------
+
 
 @REM -------------------------
 @REM SUIT