Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
4adede42
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,发现更多精彩内容 >>
提交
4adede42
编写于
10月 04, 2013
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: python module updates
上级
c0a27ea1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
7 deletion
+38
-7
cmake/OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+1
-0
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+11
-0
modules/python/CMakeLists.txt
modules/python/CMakeLists.txt
+26
-7
未找到文件。
cmake/OpenCVDetectPython.cmake
浏览文件 @
4adede42
...
@@ -37,6 +37,7 @@ if(PYTHON_EXECUTABLE)
...
@@ -37,6 +37,7 @@ if(PYTHON_EXECUTABLE)
endif
()
endif
()
if
(
NOT ANDROID AND NOT IOS
)
if
(
NOT ANDROID AND NOT IOS
)
ocv_check_environment_variables
(
PYTHON_LIBRARY PYTHON_INCLUDE_DIR
)
if
(
CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL
)
if
(
CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL
)
find_host_package
(
PythonLibs
${
PYTHON_VERSION_FULL
}
EXACT
)
find_host_package
(
PythonLibs
${
PYTHON_VERSION_FULL
}
EXACT
)
else
()
else
()
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
4adede42
...
@@ -11,6 +11,17 @@ if(NOT COMMAND find_host_program)
...
@@ -11,6 +11,17 @@ if(NOT COMMAND find_host_program)
endmacro
()
endmacro
()
endif
()
endif
()
macro
(
ocv_check_environment_variables
)
foreach
(
_var
${
ARGN
}
)
if
(
NOT DEFINED
${
_var
}
AND DEFINED ENV{
${
_var
}
}
)
set
(
__value
"$ENV{
${
_var
}
}"
)
file
(
TO_CMAKE_PATH
"
${
__value
}
"
__value
)
# Assume that we receive paths
set
(
${
_var
}
"
${
__value
}
"
)
message
(
STATUS
"Update variable
${
_var
}
from environment:
${${
_var
}}
"
)
endif
()
endforeach
()
endmacro
()
# adds include directories in such way that directories from the OpenCV source tree go first
# adds include directories in such way that directories from the OpenCV source tree go first
function
(
ocv_include_directories
)
function
(
ocv_include_directories
)
set
(
__add_before
""
)
set
(
__add_before
""
)
...
...
modules/python/CMakeLists.txt
浏览文件 @
4adede42
...
@@ -105,10 +105,29 @@ else()
...
@@ -105,10 +105,29 @@ else()
set
(
PYTHON_INSTALL_CONFIGURATIONS
""
)
set
(
PYTHON_INSTALL_CONFIGURATIONS
""
)
endif
()
endif
()
install
(
TARGETS
${
the_module
}
if
(
WIN32
)
${
PYTHON_INSTALL_CONFIGURATIONS
}
set
(
PYTHON_INSTALL_ARCHIVE
""
)
RUNTIME DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
else
()
LIBRARY DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
set
(
PYTHON_INSTALL_ARCHIVE ARCHIVE DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
)
ARCHIVE DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
endif
()
)
install
(
FILES src2/cv.py
${
PYTHON_INSTALL_CONFIGURATIONS
}
DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
)
if
(
NOT INSTALL_CREATE_DISTRIB
)
install
(
TARGETS
${
the_module
}
${
PYTHON_INSTALL_CONFIGURATIONS
}
RUNTIME DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
LIBRARY DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
${
PYTHON_INSTALL_ARCHIVE
}
)
install
(
FILES src2/cv.py
${
PYTHON_INSTALL_CONFIGURATIONS
}
DESTINATION
${
PYTHON_PACKAGES_PATH
}
COMPONENT main
)
else
()
if
(
DEFINED PYTHON_VERSION_MAJOR
)
set
(
__ver
"
${
PYTHON_VERSION_MAJOR
}
.
${
PYTHON_VERSION_MINOR
}
"
)
else
()
set
(
__ver
"unknown"
)
endif
()
install
(
TARGETS
${
the_module
}
CONFIGURATIONS Release
RUNTIME DESTINATION python/
${
__ver
}
/
${
OpenCV_ARCH
}
COMPONENT main
LIBRARY DESTINATION python/
${
__ver
}
/
${
OpenCV_ARCH
}
COMPONENT main
)
endif
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录