Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
9bee835d
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
9bee835d
编写于
1月 20, 2016
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: fix python detection
上级
347ffbb0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
11 deletion
+12
-11
cmake/OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+12
-11
未找到文件。
cmake/OpenCVDetectPython.cmake
浏览文件 @
9bee835d
...
...
@@ -26,7 +26,7 @@ function(find_python preferred_version min_version library_env include_dir_env
libs_found libs_version_string libraries library debug_libraries
debug_library include_path include_dir include_dir2 packages_path
numpy_include_dirs numpy_version
)
if
(
NOT
${
found
}
)
ocv_check_environment_variables
(
${
executable
}
)
if
(
${
executable
}
)
set
(
PYTHON_EXECUTABLE
"
${${
executable
}}
"
)
...
...
@@ -197,23 +197,24 @@ function(find_python preferred_version min_version library_env include_dir_env
endif
()
# Export return values
set
(
${
found
}
"
${
_found
}
"
PARENT_SCOPE
)
set
(
${
found
}
"
${
_found
}
"
CACHE INTERNAL
""
)
set
(
${
executable
}
"
${
_executable
}
"
CACHE FILEPATH
"Path to Python interpretor"
)
set
(
${
version_string
}
"
${
_version_string
}
"
PARENT_SCOPE
)
set
(
${
version_major
}
"
${
_version_major
}
"
PARENT_SCOPE
)
set
(
${
version_minor
}
"
${
_version_minor
}
"
PARENT_SCOPE
)
set
(
${
libs_found
}
"
${
_libs_found
}
"
PARENT_SCOPE
)
set
(
${
libs_version_string
}
"
${
_libs_version_string
}
"
PARENT_SCOPE
)
set
(
${
libraries
}
"
${
_libraries
}
"
PARENT_SCOPE
)
set
(
${
version_string
}
"
${
_version_string
}
"
CACHE INTERNAL
""
)
set
(
${
version_major
}
"
${
_version_major
}
"
CACHE INTERNAL
""
)
set
(
${
version_minor
}
"
${
_version_minor
}
"
CACHE INTERNAL
""
)
set
(
${
libs_found
}
"
${
_libs_found
}
"
CACHE INTERNAL
""
)
set
(
${
libs_version_string
}
"
${
_libs_version_string
}
"
CACHE INTERNAL
""
)
set
(
${
libraries
}
"
${
_libraries
}
"
CACHE INTERNAL
"Python libraries"
)
set
(
${
library
}
"
${
_library
}
"
CACHE FILEPATH
"Path to Python library"
)
set
(
${
debug_libraries
}
"
${
_debug_libraries
}
"
PARENT_SCOPE
)
set
(
${
debug_libraries
}
"
${
_debug_libraries
}
"
CACHE INTERNAL
""
)
set
(
${
debug_library
}
"
${
_debug_library
}
"
CACHE FILEPATH
"Path to Python debug"
)
set
(
${
include_path
}
"
${
_include_path
}
"
PARENT_SCOPE
)
set
(
${
include_path
}
"
${
_include_path
}
"
CACHE INTERNAL
""
)
set
(
${
include_dir
}
"
${
_include_dir
}
"
CACHE PATH
"Python include dir"
)
set
(
${
include_dir2
}
"
${
_include_dir2
}
"
CACHE PATH
"Python include dir 2"
)
set
(
${
packages_path
}
"
${
_packages_path
}
"
CACHE PATH
"Where to install the python packages."
)
set
(
${
numpy_include_dirs
}
${
_numpy_include_dirs
}
CACHE PATH
"Path to numpy headers"
)
set
(
${
numpy_version
}
"
${
_numpy_version
}
"
PARENT_SCOPE
)
set
(
${
numpy_version
}
"
${
_numpy_version
}
"
CACHE INTERNAL
""
)
endif
()
endfunction
(
find_python
)
find_python
(
2.7
"
${
MIN_VER_PYTHON2
}
"
PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录