mirror of https://github.com/opencv/opencv.git
- drop EnableDelayedExpansion - pause on failed commands (non-interactive mode)pull/13177/head
parent
e5afa62c3d
commit
8792bddb0a
1 changed files with 28 additions and 10 deletions
@ -1,18 +1,36 @@ |
|||||||
@ECHO OFF |
@ECHO OFF |
||||||
SETLOCAL EnableDelayedExpansion |
|
||||||
|
|
||||||
SET "SCRIPT_DIR=%~dp0" |
SET "SCRIPT_DIR=%~dp0" |
||||||
|
|
||||||
IF NOT DEFINED OPENCV_QUIET ( ECHO Setting vars for OpenCV @OPENCV_VERSION@ ) |
IF NOT DEFINED OPENCV_QUIET ( ECHO Setting vars for OpenCV @OPENCV_VERSION@ ) |
||||||
SET "PATH=!SCRIPT_DIR!\@OPENCV_LIB_RUNTIME_DIR_RELATIVE_CMAKECONFIG@;%PATH%" |
SET "PATH=%SCRIPT_DIR%\@OPENCV_LIB_RUNTIME_DIR_RELATIVE_CMAKECONFIG@;%PATH%" |
||||||
|
|
||||||
IF NOT DEFINED OPENCV_SKIP_PYTHON ( |
IF NOT DEFINED OPENCV_SKIP_PYTHON CALL :SET_PYTHON |
||||||
SET "PYTHONPATH_OPENCV=!SCRIPT_DIR!\@OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG@" |
|
||||||
IF NOT DEFINED OPENCV_QUIET ( ECHO Append PYTHONPATH: !PYTHONPATH_OPENCV! ) |
SET SCRIPT_DIR= |
||||||
SET "PYTHONPATH=!PYTHONPATH_OPENCV!;%PYTHONPATH%" |
|
||||||
) |
IF NOT [%1] == [] GOTO :RUN_COMMAND |
||||||
|
|
||||||
|
GOTO :EOF |
||||||
|
|
||||||
IF NOT [%1] == [] ( |
:RUN_COMMAND |
||||||
%* |
SET RUN_INTERACTIVE=1 |
||||||
EXIT /B !errorlevel! |
echo %CMDCMDLINE% | find /i "%~0" >nul |
||||||
|
IF NOT errorlevel 1 set RUN_INTERACTIVE=0 |
||||||
|
|
||||||
|
%* |
||||||
|
SET RESULT=%ERRORLEVEL% |
||||||
|
IF %RESULT% NEQ 0 ( |
||||||
|
IF _%RUN_INTERACTIVE%_==_0_ ( IF NOT DEFINED OPENCV_BATCH_MODE ( pause ) ) |
||||||
) |
) |
||||||
|
EXIT /B %RESULT% |
||||||
|
|
||||||
|
:SET_PYTHON |
||||||
|
SET "PYTHONPATH_OPENCV=%SCRIPT_DIR%\@OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG@" |
||||||
|
IF NOT DEFINED OPENCV_QUIET ( ECHO Append PYTHONPATH: %PYTHONPATH_OPENCV% ) |
||||||
|
SET "PYTHONPATH=%PYTHONPATH_OPENCV%;%PYTHONPATH%" |
||||||
|
SET PYTHONPATH_OPENCV= |
||||||
|
EXIT /B |
||||||
|
|
||||||
|
|
||||||
|
:EOF |
||||||
|
Loading…
Reference in new issue