Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
7a8f9fe7
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,发现更多精彩内容 >>
提交
7a8f9fe7
编写于
10月 24, 2013
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: fix android installation for different NDK ABIs
上级
f177e658
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
7 deletion
+16
-7
cmake/OpenCVGenConfig.cmake
cmake/OpenCVGenConfig.cmake
+11
-6
cmake/templates/OpenCVConfig.cmake.in
cmake/templates/OpenCVConfig.cmake.in
+5
-1
未找到文件。
cmake/OpenCVGenConfig.cmake
浏览文件 @
7a8f9fe7
...
...
@@ -74,7 +74,12 @@ if(ANDROID AND NOT BUILD_SHARED_LIBS AND HAVE_TBB)
list
(
APPEND OpenCV2_INCLUDE_DIRS_CONFIGCMAKE
${
TBB_INCLUDE_DIRS
}
)
endif
()
export
(
TARGETS
${
OpenCVModules_TARGETS
}
FILE
"
${
CMAKE_BINARY_DIR
}
/OpenCVModules.cmake"
)
set
(
modules_file_suffix
""
)
if
(
ANDROID
)
set
(
modules_file_suffix
"-
${
ANDROID_NDK_ABI_NAME
}
"
)
endif
()
export
(
TARGETS
${
OpenCVModules_TARGETS
}
FILE
"
${
CMAKE_BINARY_DIR
}
/OpenCVModules
${
modules_file_suffix
}
.cmake"
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCVConfig.cmake"
IMMEDIATE @ONLY
)
#support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
...
...
@@ -94,7 +99,7 @@ endif()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
IMMEDIATE @ONLY
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake"
IMMEDIATE @ONLY
)
if
(
UNIX
)
if
(
UNIX
)
# ANDROID configuration is created here also
#http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference
# For a command "find_package(<name> [major[.minor]] [EXACT] [REQUIRED|QUIET])"
# cmake will look in the following dir on unix:
...
...
@@ -104,11 +109,11 @@ if(UNIX)
if
(
INSTALL_TO_MANGLED_PATHS
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/
)
install
(
EXPORT OpenCVModules DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/
)
install
(
EXPORT OpenCVModules DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/
FILE OpenCVModules
${
modules_file_suffix
}
.cmake
)
else
()
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
/
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
/
)
install
(
EXPORT OpenCVModules DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
/
)
install
(
EXPORT OpenCVModules DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
/
FILE OpenCVModules
${
modules_file_suffix
}
.cmake
)
endif
()
endif
()
...
...
@@ -128,10 +133,10 @@ if(WIN32)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
IMMEDIATE @ONLY
)
if
(
BUILD_SHARED_LIBS
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
/lib"
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
/lib"
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
/lib"
FILE OpenCVModules
${
modules_file_suffix
}
.cmake
)
else
()
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
/staticlib"
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
/staticlib"
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
/staticlib"
FILE OpenCVModules
${
modules_file_suffix
}
.cmake
)
endif
()
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
"
)
install
(
FILES
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/"
)
...
...
cmake/templates/OpenCVConfig.cmake.in
浏览文件 @
7a8f9fe7
...
...
@@ -36,7 +36,11 @@
#
# ===================================================================================
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules.cmake)
if(NOT ANDROID)
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules.cmake)
else()
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules-${ANDROID_NDK_ABI_NAME}.cmake)
endif()
# TODO All things below should be reviewed. What is about of moving this code into related modules (special vars/hooks/files)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录