Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
131d199a
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,发现更多精彩内容 >>
提交
131d199a
编写于
10月 10, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12793 from alalek:cmake_fix_python_standalone
上级
ad93ed72
40489381
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
2 deletion
+8
-2
cmake/OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+7
-1
modules/python/standalone.cmake
modules/python/standalone.cmake
+1
-1
未找到文件。
cmake/OpenCVDetectPython.cmake
浏览文件 @
131d199a
...
...
@@ -59,15 +59,21 @@ if(NOT ${found})
if
(
NOT PYTHONINTERP_FOUND
)
message
(
STATUS
"Python is not found:
${
preferred_version
}
EXACT"
)
endif
()
else
(
)
else
if
(
min_version
)
set
(
__python_package_version
"
${
min_version
}
"
)
find_host_package
(
PythonInterp
"
${
min_version
}
"
)
else
()
set
(
__python_package_version
""
)
find_host_package
(
PythonInterp
)
endif
()
string
(
REGEX MATCH
"^[0-9]+"
_python_version_major
"
${
min_version
}
"
)
if
(
PYTHONINTERP_FOUND
)
# Check if python major version is correct
if
(
"
${
_python_version_major
}
"
STREQUAL
" "
)
set
(
_python_version_major
"
${
PYTHON_VERSION_MAJOR
}
"
)
endif
()
if
(
NOT
"
${
_python_version_major
}
"
STREQUAL
"
${
PYTHON_VERSION_MAJOR
}
"
AND NOT DEFINED
${
executable
}
)
...
...
modules/python/standalone.cmake
浏览文件 @
131d199a
...
...
@@ -10,7 +10,7 @@ include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")
set
(
OPENCV_PYTHON_SKIP_DETECTION ON
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVDetectPython.cmake"
)
find_python
(
"
"
"2.7
"
PYTHON_LIBRARY PYTHON_INCLUDE_DIR
find_python
(
"
${
OPENCV_PYTHON_VERSION
}
"
"
${
OPENCV_PYTHON_VERSION
}
"
PYTHON_LIBRARY PYTHON_INCLUDE_DIR
PYTHONINTERP_FOUND PYTHON_EXECUTABLE PYTHON_VERSION_STRING
PYTHON_VERSION_MAJOR PYTHON_VERSION_MINOR PYTHONLIBS_FOUND
PYTHONLIBS_VERSION_STRING PYTHON_LIBRARIES PYTHON_LIBRARY
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录