Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6cb90c0e
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,发现更多精彩内容 >>
提交
6cb90c0e
编写于
1月 20, 2014
作者:
V
Vincent Rabaud
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix cross-compilation issue with Numpy
上级
6bf599b1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
8 deletion
+29
-8
cmake/OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+29
-8
未找到文件。
cmake/OpenCVDetectPython.cmake
浏览文件 @
6cb90c0e
...
...
@@ -80,14 +80,29 @@ if(PYTHON_EXECUTABLE)
endif
()
SET
(
PYTHON_PACKAGES_PATH
"
${
_PYTHON_PACKAGES_PATH
}
"
CACHE PATH
"Where to install the python packages."
)
if
(
NOT PYTHON_NUMPY_INCLUDE_DIR
)
# Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
RESULT_VARIABLE PYTHON_NUMPY_PROCESS
OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
NOT CMAKE_CROSSCOMPILING
)
if
(
NOT PYTHON_NUMPY_INCLUDE_DIR
)
# Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
RESULT_VARIABLE PYTHON_NUMPY_PROCESS
OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
PYTHON_NUMPY_PROCESS EQUAL 0
)
if
(
PYTHON_NUMPY_PROCESS EQUAL 0
)
file
(
TO_CMAKE_PATH
"
${
PYTHON_NUMPY_INCLUDE_DIR
}
"
_PYTHON_NUMPY_INCLUDE_DIR
)
set
(
PYTHON_NUMPY_INCLUDE_DIR
${
_PYTHON_NUMPY_INCLUDE_DIR
}
CACHE PATH
"Path to numpy headers"
)
endif
()
endif
()
else
()
if
(
NOT PYTHON_NUMPY_INCLUDE_DIR
)
message
(
STATUS
"Cannot probe for Python/Numpy support (because we are cross-compiling OpenCV)"
)
message
(
STATUS
"If you want to enable Python/Numpy support, set the following variables:"
)
message
(
STATUS
" PYTHON_EXECUTABLE"
)
message
(
STATUS
" PYTHON_INCLUDE_DIR"
)
message
(
STATUS
" PYTHON_LIBRARY"
)
message
(
STATUS
" PYTHON_NUMPY_INCLUDE_DIR"
)
message
(
STATUS
" PYTHON_NUMPY_VERSION"
)
else
()
file
(
TO_CMAKE_PATH
"
${
PYTHON_NUMPY_INCLUDE_DIR
}
"
_PYTHON_NUMPY_INCLUDE_DIR
)
set
(
PYTHON_NUMPY_INCLUDE_DIR
${
_PYTHON_NUMPY_INCLUDE_DIR
}
CACHE PATH
"Path to numpy headers"
)
endif
()
...
...
@@ -95,10 +110,16 @@ if(PYTHON_EXECUTABLE)
if
(
PYTHON_NUMPY_INCLUDE_DIR
)
set
(
PYTHON_USE_NUMPY TRUE
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import numpy; print numpy.version.version"
if
(
NOT CMAKE_CROSSCOMPILING
)
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import numpy; print numpy.version.version"
RESULT_VARIABLE PYTHON_NUMPY_PROCESS
OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else
()
if
(
NOT PYTHON_NUMPY_VERSION
)
set
(
PYTHON_NUMPY_VERSION
"undefined - cannot be probed because of the cross-compilation"
)
endif
()
endif
()
endif
()
endif
(
NOT ANDROID AND NOT IOS
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录