set SALOME_ROOT_DIR=%ROOT_DIR%\SALOME
)
-if "%SOLVESPACE_ROOT_DIR%" == "" (
- SET SOLVESPACE_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\solvespace-2.1
-)
-SET PATH=%SOLVESPACE_ROOT_DIR%\lib;%PATH%
-
if "%PLANEGCS_ROOT_DIR%" == "" (
SET PLANEGCS_ROOT_DIR=%SALOME_ROOT_DIR%\PRODUCTS%OCC_LIB_PREFIX%\planegcs-0.18
)
cd /d %SALOME_ROOT_DIR%\WORK
call set_env.bat %1
-if %2 == run (
+if "%2" == run (
call "%PDIR%\env_launch.bat"
) else (
call "%PDIR%\env_compile.bat"
@SET _NO_DEBUG_HEAP=1
-if "%VS140COMNTOOLS%" == "" (
- echo Could not find MS Visual Studio: variable VS140COMNTOOLS is not defined!
- exit 1
-) else if exist "%VS140COMNTOOLS%\..\IDE\devenv.exe" (
- set MSVC_EXE="%VS140COMNTOOLS%\..\IDE\devenv.exe"
-) else if exist "%VS140COMNTOOLS%\..\IDE\VCExpress.exe" (
- set MSVC_EXE="%VS140COMNTOOLS%\..\IDE\VCExpress.exe"
+@SET VC_VERSION_SHORT=15
+for /f "tokens=1,2*" %%a in ('reg query "HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /v "%VC_VERSION_SHORT%.0" 2^>nul') do set "VSPATH=%%c"
+IF NOT EXIST "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" GOTO ERROR1
+
+if exist "%VSPATH%\Common7\IDE\devenv.exe" (
+ SET msvc_exe=devenv
+) else if exist "%VSPATH%\Common7\IDE\VCExpress.exe" (
+ SET msvc_exe=VCExpress
) else (
- echo "Could not find MS Visual Studio in %VS140COMNTOOLS%\..\IDE"
- echo Check environment variable VS140COMNTOOLS!
- exit 1
+ GOTO ERROR1
)
-call "%VS140COMNTOOLS%..\Tools\vsvars32.bat"
+call "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 > NUL
@SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
@SET PATH=%SHAPER_ROOT_DIR%\lib\salome;%PATH%
REM @SET PYTHONPATH=%SHAPER_ROOT_DIR%\bin\salome;%PYTHONPATH%
@SET LightAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
+
+goto END
+
+:ERROR1
+ECHO "Visual Studio environment file is not found."
+
+:END