Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
3c5fec67
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3c5fec67
编写于
3月 31, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build: updates for winpack dldt
上级
95a07ca1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
77 addition
and
21 deletion
+77
-21
CMakeLists.txt
CMakeLists.txt
+2
-2
modules/videoio/CMakeLists.txt
modules/videoio/CMakeLists.txt
+1
-2
samples/_winpack_build_sample.cmd
samples/_winpack_build_sample.cmd
+36
-9
samples/_winpack_run_python_sample.cmd
samples/_winpack_run_python_sample.cmd
+21
-3
samples/python/demo.py
samples/python/demo.py
+17
-5
未找到文件。
CMakeLists.txt
浏览文件 @
3c5fec67
...
...
@@ -946,11 +946,11 @@ endif()
# for UNIX it does not make sense as LICENSE and readme will be part of the package automatically
if
(
ANDROID OR NOT UNIX
)
install
(
FILES
${
OPENCV_LICENSE_FILE
}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
PERMISSIONS OWNER_READ
OWNER_WRITE
GROUP_READ WORLD_READ
DESTINATION ./ COMPONENT libs
)
if
(
OPENCV_README_FILE
)
install
(
FILES
${
OPENCV_README_FILE
}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
PERMISSIONS OWNER_READ
OWNER_WRITE
GROUP_READ WORLD_READ
DESTINATION ./ COMPONENT libs
)
endif
()
endif
()
...
...
modules/videoio/CMakeLists.txt
浏览文件 @
3c5fec67
...
...
@@ -221,7 +221,6 @@ if(WIN32 AND HAVE_FFMPEG_WRAPPER)
endif
()
install
(
FILES
"
${
ffmpeg_path
}
"
DESTINATION
${
OPENCV_BIN_INSTALL_PATH
}
COMPONENT libs RENAME
"
${
ffmpeg_bare_name_ver
}
"
)
if
(
INSTALL_CREATE_DISTRIB
)
install
(
FILES
"
${
ffmpeg_dir
}
/opencv_videoio_ffmpeg.dll"
DESTINATION
"bin/"
COMPONENT libs RENAME
"opencv_videoio_ffmpeg
${
OPENCV_DLLVERSION
}
.dll"
)
install
(
FILES
"
${
ffmpeg_dir
}
/opencv_videoio_ffmpeg_64.dll"
DESTINATION
"bin/"
COMPONENT libs RENAME
"opencv_videoio_ffmpeg
${
OPENCV_DLLVERSION
}
_64.dll"
)
install
(
FILES
"
${
ffmpeg_dir
}
/opencv_videoio_ffmpeg
${
FFMPEG_SUFFIX
}
.dll"
DESTINATION
"bin/"
COMPONENT libs RENAME
"opencv_videoio_ffmpeg
${
OPENCV_DLLVERSION
}${
FFMPEG_SUFFIX
}
.dll"
)
endif
()
endif
()
samples/_winpack_build_sample.cmd
浏览文件 @
3c5fec67
...
...
@@ -4,16 +4,24 @@
:: - > _winpack_build_sample.cmd cpp\opencv_version.cpp
:: Requires:
:: - CMake
:: - MSVS 2015/2017
:: - MSVS 2015/2017
/2019
:: (tools are searched on default paths or environment should be pre-configured)
@echo
off
setlocal
set
SCRIPTDIR
=
%~dp0
if
NOT
exist
"
%SCRIPTDIR%
\..\..\build"
(
SET
SCRIPT_DIR
=
%~dp0
SET
"OPENCV_SETUPVARS_SCRIPT=setup_vars_opencv4.cmd"
SET
"PACKAGE_BUILD_DIR=
%SCRIPT_DIR%
\..\..\build"
IF
NOT
EXIST
"
%PACKAGE_BUILD_DIR%
\
%OPENCV_SETUPVARS_SCRIPT%
"
(
::
Winpack
DLDT
SET
"PACKAGE_BUILD_DIR=
%SCRIPT_DIR%
\..\..\..\build"
)
IF
NOT
EXIST
"
%PACKAGE_BUILD_DIR%
\
%OPENCV_SETUPVARS_SCRIPT%
"
(
set
"MSG=OpenCV Winpack installation is required"
goto
die
)
:: normalize path
for
%%i
in
(
"
%PACKAGE_BUILD_DIR%
"
)
do
SET
"PACKAGE_BUILD_DIR=
%%~fi
"
if
[
%
1
]==[]
(
set
"MSG=Sample path is required"
...
...
@@ -35,8 +43,8 @@ set "SRC_NAME=%~n1"
echo
SRC_NAME
=
%SRC_NAME%
echo
================================================================================
:: Path to
FFMPEG binary files
set
"PATH=
%PA
TH%
;
%SCRIPTDIR%
\..\..\build\bin\
"
:: Path to
root 'bin' dir
set
"PATH=
%PA
CKAGE_BUILD_DIR%
\bin;
%PATH%
"
:: Detect compiler
cl
/
?
>
NUL
2
>
NUL
<
NUL
...
...
@@ -102,12 +110,21 @@ if NOT DEFINED VisualStudioVersion (
if
"
%VisualStudioVersion%
"
==
"14.0"
(
set
"CMAKE_GENERATOR=-G
^"
Visual Studio 14 Win64
^"
"
set
"BUILD_DIR_SUFFIX=.vc14"
set
"PATH=
%PATH%
;
%SCRIPTDIR%
\..\..\build\x64\vc14\bin\"
if
EXIST
"
%PACKAGE_BUILD_DIR%
\x64\vc14\bin"
(
set
"PATH=
%PACKAGE_BUILD_DIR%
\x64\vc14\bin;
%PATH%
"
)
)
else
(
if
"
%VisualStudioVersion%
"
==
"15.0"
(
set
"CMAKE_GENERATOR=-G
^"
Visual Studio 15 Win64
^"
"
set
"BUILD_DIR_SUFFIX=.vc15"
set
"PATH=
%PATH%
;
%SCRIPTDIR%
\..\..\build\x64\vc15\bin\"
if
EXIST
"
%PACKAGE_BUILD_DIR%
\x64\vc15\bin"
(
set
"PATH=
%PACKAGE_BUILD_DIR%
\x64\vc15\bin;
%PATH%
"
)
else
(
if
EXIST
"
%PACKAGE_BUILD_DIR%
\x64\vc14\bin"
(
set
"PATH=
%PACKAGE_BUILD_DIR%
\x64\vc14\bin;
%PATH%
"
)
)
)
else
(
if
"
%VisualStudioVersion%
"
==
"16.0"
(
echo
.
==========================================
...
...
@@ -115,7 +132,17 @@ if "%VisualStudioVersion%" == "14.0" (
echo
.
==========================================
set
"CMAKE_GENERATOR=-G
^"
Visual Studio 16 2019
^"
-A x64"
set
"BUILD_DIR_SUFFIX=.vc16"
set
"PATH=
%PATH%
;
%SCRIPTDIR%
\..\..\build\x64\vc15\bin\"
if
EXIST
"
%PACKAGE_BUILD_DIR%
\x64\vc16\bin"
(
set
"PATH=
%PACKAGE_BUILD_DIR%
\x64\vc16\bin;
%PATH%
"
)
else
(
if
EXIST
"
%PACKAGE_BUILD_DIR%
\x64\vc15\bin"
(
set
"PATH=
%PACKAGE_BUILD_DIR%
\x64\vc15\bin;
%PATH%
"
)
else
(
if
EXIST
"
%PACKAGE_BUILD_DIR%
\x64\vc14\bin"
(
set
"PATH=
%PACKAGE_BUILD_DIR%
\x64\vc14\bin;
%PATH%
"
)
)
)
)
else
(
set
"MSG=Unsupported MSVS version. VisualStudioVersion=
%VisualStudioVersion%
"
goto
die
...
...
@@ -128,10 +155,10 @@ call :set_title Create build directory
if
NOT
exist
"
%BUILD_DIR%
"
(
call
:execute
md
"
%BUILD_DIR%
"
)
PUSHD
"
%BUILD_DIR%
"
if
NOT
exist
"
%BUILD_DIR%
/sample"
(
call
:execute
md
"
%BUILD_DIR%
/sample"
)
call
:execute
copy
/Y
"
%SCRIPTDIR%
/CMakeLists.example.in"
"
%BUILD_DIR%
/sample/CMakeLists.txt"
call
:execute
copy
/Y
"
%SCRIPT
_
DIR%
/CMakeLists.example.in"
"
%BUILD_DIR%
/sample/CMakeLists.txt"
call
:set
_title
Configuring
via
CMake
call
:execute
cmake
%CMAKE_GENERATOR%
"
%BUILD_DIR%
\sample"
-DEXAMPLE
_NAME
=
%SRC_NAME%
"-DEXAMPLE_FILE=
%SRC_FILENAME%
"
"-DOpenCV_DIR=
%SCRIPTDIR%
\..\..\build"
call
:execute
cmake
%CMAKE_GENERATOR%
"
%BUILD_DIR%
\sample"
-DEXAMPLE
_NAME
=
%SRC_NAME%
"-DEXAMPLE_FILE=
%SRC_FILENAME%
"
if
%ERRORLEVEL%
NEQ
0
(
set
"MSG=CMake configuration step failed:
%BUILD_DIR%
"
goto
die
...
...
samples/_winpack_run_python_sample.cmd
浏览文件 @
3c5fec67
...
...
@@ -2,11 +2,19 @@
SETLOCAL
SET
SCRIPT_DIR
=
%~dp0
IF
NOT
EXIST
"
%SCRIPT_DIR%
\..\..\build\setup_vars_opencv4.cmd"
(
SET
"OPENCV_SETUPVARS_SCRIPT=setup_vars_opencv4.cmd"
SET
"BUILD_DIR=
%SCRIPT_DIR%
\..\..\build"
IF
NOT
EXIST
"
%BUILD_DIR%
\
%OPENCV_SETUPVARS_SCRIPT%
"
(
::
Winpack
DLDT
SET
"BUILD_DIR=
%SCRIPT_DIR%
\..\..\..\build"
)
IF
NOT
EXIST
"
%BUILD_DIR%
\
%OPENCV_SETUPVARS_SCRIPT%
"
(
ECHO
ERROR
:
OpenCV
Winpack
installation
is
required
pause
exit
)
:: normalize path
for
%%i
in
(
"
%PACKAGE_BUILD_DIR%
"
)
do
SET
"PACKAGE_BUILD_DIR=
%%~fi
"
:: Detect Python binary
python
-V
2
>
nul
...
...
@@ -80,7 +88,11 @@ echo SRC_FILENAME=%SRC_FILENAME%
call
:dirname
"
%SRC_FILENAME%
"
SRC_DIR
call
:dirname
"
%PYTHON%
"
PYTHON_DIR
PUSHD
%SRC_DIR%
CALL
"
%SCRIPT_DIR%
\..\..\build\setup_vars_opencv4.cmd"
CALL
"
%BUILD_DIR%
\
%OPENCV_SETUPVARS_SCRIPT%
"
:: repair SCRIPT_DIR
SET
"SCRIPT_DIR=
%~dp0
"
ECHO
Run
:
%
*
%PYTHON%
%
*
SET
result
=
%errorlevel%
...
...
@@ -94,17 +106,23 @@ IF %result% NEQ 0 (
cmd
/k
echo
Current
directory
:
%CD%
)
)
POPD
EXIT
/B
%result%
:rundemo
PUSHD
"
%SCRIPT_DIR%
\python"
CALL
"
%SCRIPT_DIR%
\..\..\build\setup_vars_opencv4.cmd"
CALL
"
%BUILD_DIR%
\
%OPENCV_SETUPVARS_SCRIPT%
"
:: repair SCRIPT_DIR
SET
"SCRIPT_DIR=
%~dp0
"
%PYTHON%
demo
.py
SET
result
=
%errorlevel%
IF
%result%
NEQ
0
(
IF
NOT
DEFINED
OPENCV_BATCH_MODE
(
pause
)
)
POPD
EXIT
/B
%result%
...
...
samples/python/demo.py
浏览文件 @
3c5fec67
...
...
@@ -114,12 +114,24 @@ class App:
def
on_demo_select
(
self
,
evt
):
name
=
self
.
demos_lb
.
get
(
self
.
demos_lb
.
curselection
()[
0
]
)
fn
=
self
.
samples
[
name
]
loc
=
{}
descr
=
""
try
:
execfile
(
fn
,
loc
)
# Python 2
except
NameError
:
exec
(
open
(
fn
).
read
(),
loc
)
# Python 3
descr
=
loc
.
get
(
'__doc__'
,
'no-description'
)
if
sys
.
version_info
[
0
]
>
2
:
# Python 3.x
module_globals
=
{}
module_locals
=
{}
with
open
(
fn
,
'r'
)
as
f
:
module_code
=
f
.
read
()
exec
(
compile
(
module_code
,
fn
,
'exec'
),
module_globals
,
module_locals
)
descr
=
module_locals
.
get
(
'__doc__'
,
'no-description'
)
else
:
# Python 2
module_globals
=
{}
execfile
(
fn
,
module_globals
)
# noqa: F821
descr
=
module_globals
.
get
(
'__doc__'
,
'no-description'
)
except
Exception
as
e
:
descr
=
str
(
e
)
self
.
linker
.
reset
()
self
.
text
.
config
(
state
=
'normal'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录