Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ddb482b1
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,发现更多精彩内容 >>
提交
ddb482b1
编写于
2月 15, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
android: move .a files into 'staticlibs' directory
to reduce overhead of gradle builds
上级
cff79609
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
4 deletion
+12
-4
CMakeLists.txt
CMakeLists.txt
+5
-0
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVGenAndroidMK.cmake
+4
-2
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+1
-1
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCV.mk.in
+2
-1
未找到文件。
CMakeLists.txt
浏览文件 @
ddb482b1
...
...
@@ -404,6 +404,7 @@ if(ANDROID)
set
(
LIBRARY_OUTPUT_PATH
"
${
OpenCV_BINARY_DIR
}
/lib/
${
ANDROID_NDK_ABI_NAME
}
"
)
ocv_update
(
3P_LIBRARY_OUTPUT_PATH
"
${
OpenCV_BINARY_DIR
}
/3rdparty/lib/
${
ANDROID_NDK_ABI_NAME
}
"
)
ocv_update
(
OPENCV_LIB_INSTALL_PATH sdk/native/libs/
${
ANDROID_NDK_ABI_NAME
}
)
ocv_update
(
OPENCV_LIB_ARCHIVE_INSTALL_PATH sdk/native/staticlibs/
${
ANDROID_NDK_ABI_NAME
}
)
ocv_update
(
OPENCV_3P_LIB_INSTALL_PATH sdk/native/3rdparty/libs/
${
ANDROID_NDK_ABI_NAME
}
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH sdk/native/jni
)
ocv_update
(
OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include
)
...
...
@@ -472,6 +473,10 @@ else()
endif
()
ocv_update
(
OPENCV_JNI_BIN_INSTALL_PATH
"
${
OPENCV_JNI_INSTALL_PATH
}
"
)
if
(
NOT OPENCV_LIB_ARCHIVE_INSTALL_PATH
)
set
(
OPENCV_LIB_ARCHIVE_INSTALL_PATH
${
OPENCV_LIB_INSTALL_PATH
}
)
endif
()
if
(
WIN32
)
# Postfix of DLLs:
set
(
OPENCV_DLLVERSION
"
${
OPENCV_VERSION_MAJOR
}${
OPENCV_VERSION_MINOR
}${
OPENCV_VERSION_PATCH
}
"
)
...
...
cmake/OpenCVGenAndroidMK.cmake
浏览文件 @
ddb482b1
...
...
@@ -58,7 +58,8 @@ if(ANDROID)
# -------------------------------------------------------------------------------------------
set
(
OPENCV_INCLUDE_DIRS_CONFIGCMAKE
"
\"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
\"
\"
${
OpenCV_SOURCE_DIR
}
/include
\"
\"
${
OpenCV_SOURCE_DIR
}
/include/opencv
\"
"
)
set
(
OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE
"
\"
${
OpenCV_SOURCE_DIR
}
\"
"
)
set
(
OPENCV_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/lib/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
set
(
OPENCV_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/lib/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
set
(
OPENCV_LIBS_ARCHIVE_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/lib/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
set
(
OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/3rdparty/lib/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCV.mk.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCV.mk"
@ONLY
)
...
...
@@ -69,7 +70,8 @@ if(ANDROID)
# -------------------------------------------------------------------------------------------
set
(
OPENCV_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
(LOCAL_PATH)/
\$
(OPENCV_THIS_DIR)/include/opencv
\"
\"\$
(LOCAL_PATH)/
\$
(OPENCV_THIS_DIR)/include
\"
"
)
set
(
OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE
""
)
set
(
OPENCV_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../libs/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
set
(
OPENCV_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../libs/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
set
(
OPENCV_LIBS_ARCHIVE_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../staticlibs/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
set
(
OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../3rdparty/libs/
\$
(OPENCV_TARGET_ARCH_ABI)"
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCV.mk.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCV.mk"
@ONLY
)
...
...
cmake/OpenCVModule.cmake
浏览文件 @
ddb482b1
...
...
@@ -958,7 +958,7 @@ macro(_ocv_create_module)
ocv_install_target
(
${
the_module
}
EXPORT OpenCVModules OPTIONAL
RUNTIME DESTINATION
${
OPENCV_BIN_INSTALL_PATH
}
COMPONENT libs
LIBRARY DESTINATION
${
OPENCV_LIB_INSTALL_PATH
}
COMPONENT libs NAMELINK_SKIP
ARCHIVE DESTINATION
${
OPENCV_LIB_INSTALL_PATH
}
COMPONENT dev
ARCHIVE DESTINATION
${
OPENCV_LIB_
ARCHIVE_
INSTALL_PATH
}
COMPONENT dev
)
endif
()
if
(
"
${
_target_type
}
"
STREQUAL
"SHARED_LIBRARY"
)
...
...
cmake/templates/OpenCV.mk.in
浏览文件 @
ddb482b1
...
...
@@ -14,7 +14,6 @@ LOCAL_PATH:=$(subst ?,,$(firstword ?$(subst \, ,$(subst /, ,$(call my-dir)))))
OPENCV_TARGET_ARCH_ABI:=$(TARGET_ARCH_ABI)
OPENCV_THIS_DIR:=$(patsubst $(LOCAL_PATH)\\%,%,$(patsubst $(LOCAL_PATH)/%,%,$(call my-dir)))
OPENCV_MK_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
OPENCV_LIBS_DIR:=@OPENCV_LIBS_DIR_CONFIGCMAKE@
OPENCV_3RDPARTY_LIBS_DIR:=@OPENCV_3RDPARTY_LIBS_DIR_CONFIGCMAKE@
OPENCV_BASEDIR:=@OPENCV_BASE_INCLUDE_DIR_CONFIGCMAKE@
OPENCV_LOCAL_C_INCLUDES:=@OPENCV_INCLUDE_DIRS_CONFIGCMAKE@
...
...
@@ -41,8 +40,10 @@ else
endif
ifeq ($(OPENCV_LIB_TYPE),SHARED)
OPENCV_LIBS_DIR:=@OPENCV_LIBS_DIR_CONFIGCMAKE@
OPENCV_LIB_SUFFIX:=so
else
OPENCV_LIBS_DIR:=@OPENCV_LIBS_ARCHIVE_DIR_CONFIGCMAKE@
OPENCV_LIB_SUFFIX:=a
OPENCV_INSTALL_MODULES:=on
endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录