Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f60bdb24
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,发现更多精彩内容 >>
提交
f60bdb24
编写于
6月 28, 2011
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed Android.mk file generation
上级
822b0bfe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
64 addition
and
54 deletion
+64
-54
CMakeLists.txt
CMakeLists.txt
+40
-42
OpenCV.mk.in
OpenCV.mk.in
+24
-12
未找到文件。
CMakeLists.txt
浏览文件 @
f60bdb24
...
...
@@ -24,29 +24,6 @@ else()
set
(
CMAKE_INSTALL_PREFIX
"/usr/local"
CACHE PATH
"Installation Directory"
)
endif
()
# SUBDIRECTORIES:
# Save libs and executables in the same place
set
(
LIBRARY_OUTPUT_PATH
${
CMAKE_BINARY_DIR
}
/lib CACHE PATH
"Output directory for libraries"
)
set
(
EXECUTABLE_OUTPUT_PATH
${
CMAKE_BINARY_DIR
}
/bin CACHE PATH
"Output directory for applications"
)
if
(
ANDROID
)
set
(
OPENCV_DOC_INSTALL_PATH doc
)
elseif
(
WIN32
)
set
(
OPENCV_DOC_INSTALL_PATH doc
)
else
()
set
(
OPENCV_DOC_INSTALL_PATH share/OpenCV/doc
)
endif
()
if
(
ANDROID
)
set
(
OPENCV_LIB_INSTALL_PATH libs/
${
ARMEABI_NDK_NAME
}
)
else
()
set
(
OPENCV_LIB_INSTALL_PATH lib
)
endif
()
# build configuration
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_LIB_INSTALL_PATH
}
"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
set
(
CMAKE_CONFIGURATION_TYPES
"Debug;Release"
CACHE STRING
"Configs"
FORCE
)
if
(
DEFINED CMAKE_BUILD_TYPE
)
set_property
(
CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
${
CMAKE_CONFIGURATION_TYPES
}
)
...
...
@@ -76,11 +53,32 @@ endif()
project
(
OpenCV
)
cmake_minimum_required
(
VERSION 2.4
)
if
(
MSVC
)
set
(
CMAKE_USE_RELATIVE_PATHS ON CACHE INTERNAL
""
FORCE
)
endif
()
# SUBDIRECTORIES:
# Save libs and executables in the same place
set
(
LIBRARY_OUTPUT_PATH
${
CMAKE_BINARY_DIR
}
/lib CACHE PATH
"Output directory for libraries"
)
set
(
EXECUTABLE_OUTPUT_PATH
${
CMAKE_BINARY_DIR
}
/bin CACHE PATH
"Output directory for applications"
)
if
(
ANDROID
)
set
(
OPENCV_DOC_INSTALL_PATH doc
)
elseif
(
WIN32
)
set
(
OPENCV_DOC_INSTALL_PATH doc
)
else
()
set
(
OPENCV_DOC_INSTALL_PATH share/OpenCV/doc
)
endif
()
if
(
ANDROID
)
set
(
OPENCV_LIB_INSTALL_PATH libs/
${
ARMEABI_NDK_NAME
}
)
else
()
set
(
OPENCV_LIB_INSTALL_PATH lib
)
endif
()
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_LIB_INSTALL_PATH
}
"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
# in case of cross compilation this macro will search packages
# for host system instead of packages for target system
if
(
NOT COMMAND find_host_package
)
...
...
@@ -1202,18 +1200,16 @@ if(ANDROID)
else
()
SET
(
OPENCV_LIBTYPE_CONFIGMAKE
"STATIC"
)
endif
()
if
(
ARMEABI_V7A
)
if
(
BUILD_ANDROID_CAMERA_WRAPPER
)
set
(
CMAKE_CAMERA_LIBS_CONFIGCMAKE
"native_camera_r
${
ANDROID_VERSION
}
"
)
else
()
SET
(
CMAKE_CAMERA_LIBS_CONFIGCMAKE
""
)
file
(
GLOB CMAKE_CAMERA_LIBS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/3rdparty/lib/libnative_camera_r*.so"
)
foreach
(
cam_lib
${
CMAKE_CAMERA_LIBS
}
)
get_filename_component
(
cam_lib
"
${
cam_lib
}
"
NAME
)
string
(
REGEX REPLACE
"lib(native_camera_r[0-9]+
\\
.[0-9]+
\\
.[0-9]+)
\\
.so"
"
\\
1"
cam_lib
"
${
cam_lib
}
"
)
SET
(
CMAKE_CAMERA_LIBS_CONFIGCMAKE
"
${
CMAKE_CAMERA_LIBS_CONFIGCMAKE
}
${
cam_lib
}
"
)
endforeach
()
endif
()
if
(
BUILD_ANDROID_CAMERA_WRAPPER
)
set
(
CMAKE_CAMERA_LIBS_CONFIGCMAKE
"native_camera_r
${
ANDROID_VERSION
}
"
)
else
()
SET
(
CMAKE_CAMERA_LIBS_CONFIGCMAKE
""
)
file
(
GLOB CMAKE_CAMERA_LIBS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/3rdparty/lib/libnative_camera_r*.so"
)
foreach
(
cam_lib
${
CMAKE_CAMERA_LIBS
}
)
get_filename_component
(
cam_lib
"
${
cam_lib
}
"
NAME
)
string
(
REGEX REPLACE
"lib(native_camera_r[0-9]+
\\
.[0-9]+
\\
.[0-9]+)
\\
.so"
"
\\
1"
cam_lib
"
${
cam_lib
}
"
)
SET
(
CMAKE_CAMERA_LIBS_CONFIGCMAKE
"
${
CMAKE_CAMERA_LIBS_CONFIGCMAKE
}
${
cam_lib
}
"
)
endforeach
()
endif
()
endif
(
ANDROID
)
...
...
@@ -1221,9 +1217,10 @@ endif(ANDROID)
# Part 1/2: ${BIN_DIR}/OpenCV.mk -> For use *without* "make install"
# -------------------------------------------------------------------------------------------
if
(
ANDROID
)
set
(
CMAKE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
(RELATIVE_PREFIX)
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
\"
\"\$
(RELATIVE_PREFIX)
${
CMAKE_CURRENT_SOURCE_DIR
}
/include
\"
\"\$
(RELATIVE_PREFIX)
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/opencv
\"
"
)
set
(
CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
(RELATIVE_PREFIX)
${
CMAKE_CURRENT_SOURCE_DIR
}
\"
"
)
set
(
CMAKE_LIB_DIRS_CONFIGCMAKE
"
\$
(RELATIVE_PREFIX)
${
LIBRARY_OUTPUT_PATH
}
"
)
set
(
CMAKE_INCLUDE_DIRS_CONFIGCMAKE
"
\"
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
\"
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
/include
\"
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/opencv
\"
"
)
set
(
CMAKE_BASE_INCLUDE_DIR_CONFIGCMAKE
"
\"
${
CMAKE_CURRENT_SOURCE_DIR
}
\"
"
)
set
(
CMAKE_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)"
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCV.mk.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCV.mk"
IMMEDIATE @ONLY
)
endif
(
ANDROID
)
...
...
@@ -1231,9 +1228,10 @@ endif(ANDROID)
# Part 2/2: ${BIN_DIR}/unix-install/OpenCV.mk -> For use with "make install"
# -------------------------------------------------------------------------------------------
if
(
ANDROID
)
set
(
CMAKE_INCLUDE_DIRS_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../../include/opencv
\$
(OPENCV_THIS_DIR)/../../include"
)
set
(
CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE
""
)
set
(
CMAKE_LIB_DIRS_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../../lib"
)
set
(
CMAKE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
(LOCAL_PATH)/
\$
(OPENCV_THIS_DIR)/../../include/opencv
\"
\"\$
(LOCAL_PATH)/
\$
(OPENCV_THIS_DIR)/../../include
\"
"
)
set
(
CMAKE_BASE_INCLUDE_DIR_CONFIGCMAKE
""
)
set
(
CMAKE_LIBS_DIR_CONFIGCMAKE
"
\$
(OPENCV_THIS_DIR)/../.."
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCV.mk.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCV.mk"
IMMEDIATE @ONLY
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCV.mk DESTINATION share/OpenCV/
)
endif
(
ANDROID
)
...
...
OpenCV.mk.in
浏览文件 @
f60bdb24
RELATIVE_PREFIX:=.$(shell echo $(abspath $(LOCAL_PATH))| sed -e "s/\/[^\/]*/\/../g" )
OPENCV_THIS_DIR:=$(RELATIVE_PREFIX)$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
OPENCV_LIBS_DIR:=@CMAKE_LIB_DIRS_CONFIGCMAKE@
OPENCV_BASEDIR:=@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@
USER_LOCAL_PATH:=$(LOCAL_PATH)
LOCAL_PATH:=$(subst ?,,$(firstword ?$(subst \\, ,$(subst /, ,$(call my-dir)))))
OPENCV_THIS_DIR:=$(patsubst $(LOCAL_PATH)\\%,%,$(patsubst $(LOCAL_PATH)/%,%,$(call my-dir)))
OPENCV_LIBS_DIR:=@CMAKE_LIBS_DIR_CONFIGCMAKE@
OPENCV_BASEDIR:=@CMAKE_BASE_INCLUDE_DIR_CONFIGCMAKE@
OPENCV_LOCAL_C_INCLUDES:=@CMAKE_INCLUDE_DIRS_CONFIGCMAKE@
OPENCV_MODULES := contrib calib3d objdetect features2d imgproc video highgui ml legacy flann core
ifeq ($(TARGET_ARCH_ABI),armeabi)
OPENCV_CAMERA_MODULES:=
else
OPENCV_CAMERA_MODULES:=@CMAKE_CAMERA_LIBS_CONFIGCMAKE@
endif
OPENCV_LIB_TYPE:=@OPENCV_LIBTYPE_CONFIGMAKE@
ifeq ($(OPENCV_LIB_TYPE),SHARED)
OPENCV_LIB_SUFFIX:=so
OPENCV_EXTRA_COMPONENTS:=
else
OPENCV_LIB_SUFFIX:=a
OPENCV_MODULES+= androidcamera
OPENCV_EXTRA_COMPONENTS:=@JPEG_LIBRARIES@ @PNG_LIBRARIES@ @TIFF_LIBRARIES@ @JASPER_LIBRARIES@
zlib
OPENCV_EXTRA_COMPONENTS:=@JPEG_LIBRARIES@ @PNG_LIBRARIES@ @TIFF_LIBRARIES@ @JASPER_LIBRARIES@
@ZLIB_LIBRARY@
endif
OPENCV_CAMERA_MODULES := @CMAKE_CAMERA_LIBS_CONFIGCMAKE@
define add_opencv_module
include $(CLEAR_VARS)
LOCAL_MODULE:=opencv_$1
LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_$1.$(OPENCV_LIB_SUFFIX)
LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/lib
s/$(TARGET_ARCH_ABI)/lib
opencv_$1.$(OPENCV_LIB_SUFFIX)
include $(PREBUILT_@OPENCV_LIBTYPE_CONFIGMAKE@_LIBRARY)
endef
define add_opencv_extra_component
include $(CLEAR_VARS)
LOCAL_MODULE:=$1
LOCAL_SRC_FILES:=$(OPENCV_THIS_DIR)/3rdparty/lib/lib$1.a
LOCAL_SRC_FILES:=$(OPENCV_THIS_DIR)/3rdparty/lib
s/$(TARGET_ARCH_ABI)
/lib$1.a
include $(PREBUILT_STATIC_LIBRARY)
endef
define add_opencv_camera_module
include $(CLEAR_VARS)
LOCAL_MODULE:=$1
LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/lib$1.so
LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/lib
s/$(TARGET_ARCH_ABI)/lib
$1.so
include $(PREBUILT_SHARED_LIBRARY)
endef
...
...
@@ -47,11 +54,16 @@ ifneq ($(OPENCV_BASEDIR),)
OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
endif
OPENCV_LOCAL_LIBRARIES += $(foreach mod, $(OPENCV_MODULES), opencv_$(mod))
ifeq ($(OPENCV_LIB_TYPE),STATIC)
OPENCV_LOCAL_LIBRARIES += $(foreach mod, $(OPENCV_MODULES), opencv_$(mod))
endif
OPENCV_LOCAL_LIBRARIES += $(OPENCV_EXTRA_COMPONENTS)
OPENCV_LOCAL_CFLAGS := -f
signed-char -fPIC -DANDROID
OPENCV_LOCAL_CFLAGS := -f
PIC -DANDROID -fsigned-char
include $(CLEAR_VARS)
LOCAL_C_INCLUDES += $(OPENCV_LOCAL_C_INCLUDES)
LOCAL_STATIC_LIBRARIES += $(OPENCV_LOCAL_LIBRARIES)
LOCAL_CFLAGS += $(OPENCV_LOCAL_CFLAGS)
LOCAL_PATH:=$(USER_LOCAL_PATH)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录