Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
d4b9e2d0
O
Opencv
项目概览
Greenplum
/
Opencv
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
d4b9e2d0
编写于
3月 15, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14068 from alalek:fix_python_standalone_build
上级
73bf1708
470dfba9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
8 deletion
+11
-8
modules/python/common.cmake
modules/python/common.cmake
+8
-4
modules/python/standalone.cmake
modules/python/standalone.cmake
+3
-4
未找到文件。
modules/python/common.cmake
浏览文件 @
d4b9e2d0
...
...
@@ -135,10 +135,14 @@ if(NOT OPENCV_SKIP_PYTHON_LOADER AND DEFINED OPENCV_PYTHON_INSTALL_PATH)
set
(
OPENCV_PYTHON_INSTALL_PATH_SETUPVARS
"
${
OPENCV_PYTHON_INSTALL_PATH
}
"
CACHE INTERNAL
""
)
endif
()
if
(
NOT
"
${
PYTHON
}
"
STREQUAL
" PYTHON"
AND DEFINED OPENCV_
${
PYTHON
}
_INSTALL_PATH
)
set
(
__python_binary_install_path
"
${
OPENCV_
${
PYTHON
}
_INSTALL_PATH
}
"
)
elseif
(
OPENCV_SKIP_PYTHON_LOADER AND DEFINED
${
PYTHON
}
_PACKAGES_PATH
)
set
(
__python_binary_install_path
"
${${
PYTHON
}
_PACKAGES_PATH
}
"
)
if
(
OPENCV_SKIP_PYTHON_LOADER
)
if
(
DEFINED OPENCV_
${
PYTHON
}
_INSTALL_PATH
)
set
(
__python_binary_install_path
"
${
OPENCV_
${
PYTHON
}
_INSTALL_PATH
}
"
)
elseif
(
DEFINED
${
PYTHON
}
_PACKAGES_PATH
)
set
(
__python_binary_install_path
"
${${
PYTHON
}
_PACKAGES_PATH
}
"
)
else
()
message
(
FATAL_ERROR
"Specify 'OPENCV_
${
PYTHON
}
_INSTALL_PATH' variable"
)
endif
()
else
()
ocv_assert
(
DEFINED OPENCV_PYTHON_INSTALL_PATH
)
set
(
__python_binary_install_path
"
${
OPENCV_PYTHON_INSTALL_PATH
}
/
${
__python_loader_subdir
}
python-
${${
PYTHON
}
_VERSION_MAJOR
}
.
${${
PYTHON
}
_VERSION_MINOR
}
"
)
...
...
modules/python/standalone.cmake
浏览文件 @
d4b9e2d0
...
...
@@ -5,11 +5,10 @@ include("${OpenCV_BINARY_DIR}/opencv_python_config.cmake")
if
(
NOT DEFINED OpenCV_SOURCE_DIR
)
message
(
FATAL_ERROR
"Missing OpenCV_SOURCE_DIR"
)
endif
()
if
(
NOT OPENCV_PYTHON_INSTALL_PATH
)
if
(
NOT DEFINED OPENCV_PYTHON_STANDALONE_INSTALL_PATH
)
message
(
FATAL_ERROR
"Missing OPENCV_PYTHON_STANDALONE_INSTALL_PATH / OPENCV_PYTHON_INSTALL_PATH"
)
endif
()
if
(
DEFINED OPENCV_PYTHON_STANDALONE_INSTALL_PATH
)
set
(
OPENCV_PYTHON_INSTALL_PATH
"
${
OPENCV_PYTHON_STANDALONE_INSTALL_PATH
}
"
)
elseif
(
NOT OPENCV_PYTHON_INSTALL_PATH
)
message
(
FATAL_ERROR
"Missing OPENCV_PYTHON_STANDALONE_INSTALL_PATH / OPENCV_PYTHON_INSTALL_PATH"
)
endif
()
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVUtils.cmake"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录