Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc17141
)
Porting on SALOME 7.7.0
author
vsv
<vitaly.smetannikov@opencascade.com>
Wed, 11 Nov 2015 09:21:40 +0000
(12:21 +0300)
committer
vsv
<vitaly.smetannikov@opencascade.com>
Wed, 11 Nov 2015 09:23:30 +0000
(12:23 +0300)
msvc10_env.bat
patch
|
blob
|
history
diff --git
a/msvc10_env.bat
b/msvc10_env.bat
index 5b9dc5708692283303ef95af0ae604fb85c55668..246307098222cbb07a247986d823e0948db44284 100644
(file)
--- a/
msvc10_env.bat
+++ b/
msvc10_env.bat
@@
-20,13
+20,13
@@
if "%PDIR%" == "" (
rem --------------- cmake 2.8.7 --------------
if "%CMAKEDIR%" == "" (
rem --------------- cmake 2.8.7 --------------
if "%CMAKEDIR%" == "" (
- set CMAKEDIR=%PDIR%\cmake-2.8.1
0
.2
+ set CMAKEDIR=%PDIR%\cmake-2.8.1
2
.2
)
set PATH=%CMAKEDIR%\bin;%PATH%
@REM -------------------------
@REM CASCADE
)
set PATH=%CMAKEDIR%\bin;%PATH%
@REM -------------------------
@REM CASCADE
-@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.9.
0
+@SET CAS_ROOT_DIR=%PDIR%\OCCT-6.9.
1
@SET CASROOT=%CAS_ROOT_DIR%
@REM -------------------------
@SET CASROOT=%CAS_ROOT_DIR%
@REM -------------------------
@@
-55,7
+55,7
@@
set PATH=%CMAKEDIR%\bin;%PATH%
@REM -------------------------
@REM FREEIMAGE (Used by OCCT and Graphviz)
@REM -------------------------
@REM FREEIMAGE (Used by OCCT and Graphviz)
-@SET PATH=%PDIR%\freeimage-3.1
5.4\bin
;%PATH%
+@SET PATH=%PDIR%\freeimage-3.1
6.0\dll
;%PATH%
@REM -------------------------
@REM -------------------------
@REM -------------------------
@REM -------------------------
@@
-77,7
+77,7
@@
set PATH=%CMAKEDIR%\bin;%PATH%
@REM -------------------------
@REM TBB (Used by OCCT)
@REM -------------------------
@REM TBB (Used by OCCT)
-@SET PATH=%PDIR%\tbb\bin;%PATH%
+@SET PATH=%PDIR%\tbb
-4.2.4
\bin;%PATH%
@REM -------------------------
@REM -------------------------
@REM -------------------------
@REM -------------------------
@@
-92,7
+92,7
@@
set PATH=%CMAKEDIR%\bin;%PATH%
@REM -------------------------
@REM PYTHON
@REM -------------------------
@REM PYTHON
-@SET PYTHONHOME=%PDIR%\python-2.7.
3
+@SET PYTHONHOME=%PDIR%\python-2.7.
10
@SET PYTHON_INCLUDE=%PYTHONHOME%\include
@SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH%
@SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH%
@SET PYTHON_INCLUDE=%PYTHONHOME%\include
@SET PATH=%PYTHONHOME%;%PYTHONHOME%\libs;%PATH%
@SET PYTHONPATH=%PYTHONHOME%\Lib;%PYTHONPATH%