Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
a8f0c933
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,发现更多精彩内容 >>
提交
a8f0c933
编写于
2月 24, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modified zlib search. Use system zlib on Android by default
上级
b12f1853
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
33 addition
and
36 deletion
+33
-36
3rdparty/CMakeLists.txt
3rdparty/CMakeLists.txt
+0
-3
3rdparty/libpng/CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
+1
-6
3rdparty/zlib/CMakeLists.txt
3rdparty/zlib/CMakeLists.txt
+9
-11
CMakeLists.txt
CMakeLists.txt
+21
-5
modules/core/CMakeLists.txt
modules/core/CMakeLists.txt
+0
-4
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+2
-7
未找到文件。
3rdparty/CMakeLists.txt
浏览文件 @
a8f0c933
if
(
NOT ZLIB_FOUND
)
add_subdirectory
(
zlib
)
endif
()
if
(
WITH_JASPER AND NOT JASPER_FOUND
)
add_subdirectory
(
libjasper
)
endif
()
...
...
3rdparty/libpng/CMakeLists.txt
浏览文件 @
a8f0c933
...
...
@@ -7,12 +7,7 @@ project(libpng)
# List of C++ files:
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
if
(
ZLIB_FOUND
)
include_directories
(
${
ZLIB_INCLUDE_DIR
}
)
else
()
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../zlib"
)
endif
()
include_directories
(
${
ZLIB_INCLUDE_DIR
}
)
file
(
GLOB lib_srcs *.c
)
file
(
GLOB lib_hdrs *.h
)
...
...
3rdparty/zlib/CMakeLists.txt
浏览文件 @
a8f0c933
...
...
@@ -37,11 +37,11 @@ if(MSVC)
endif
()
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/zconf.h.cmakein"
"
${
OpenCV
_BINARY_DIR
}
/zconf.h"
@ONLY
)
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
)
"
${
CMAKE_CURRENT
_BINARY_DIR
}
/zconf.h"
@ONLY
)
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
"
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
set
(
ZLIB_PUBLIC_HDRS
"
${
OpenCV
_BINARY_DIR
}
/zconf.h"
"
${
CMAKE_CURRENT
_BINARY_DIR
}
/zconf.h"
zlib.h
)
set
(
ZLIB_PRIVATE_HDRS
...
...
@@ -73,10 +73,8 @@ set(ZLIB_SRCS
zutil.c
)
set
(
the_target
"zlib"
)
add_library
(
${
the_target
}
STATIC
${
ZLIB_SRCS
}
${
ZLIB_PUBLIC_HDRS
}
${
ZLIB_PRIVATE_HDRS
}
)
set_target_properties
(
${
the_target
}
PROPERTIES DEFINE_SYMBOL ZLIB_DLL
)
add_library
(
${
ZLIB_LIBRARY
}
STATIC
${
ZLIB_SRCS
}
${
ZLIB_PUBLIC_HDRS
}
${
ZLIB_PRIVATE_HDRS
}
)
set_target_properties
(
${
ZLIB_LIBRARY
}
PROPERTIES DEFINE_SYMBOL ZLIB_DLL
)
if
(
UNIX
)
if
(
CMAKE_COMPILER_IS_GNUCXX OR CV_ICC
)
...
...
@@ -88,16 +86,16 @@ if(MSVC)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
/wd4013"
)
endif
()
set_target_properties
(
${
the_target
}
PROPERTIES
OUTPUT_NAME
"
${
the_target
}
"
set_target_properties
(
${
ZLIB_LIBRARY
}
PROPERTIES
OUTPUT_NAME
${
ZLIB_LIBRARY
}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
"
)
if
(
ENABLE_SOLUTION_FOLDERS
)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"3rdparty"
)
set_target_properties
(
${
ZLIB_LIBRARY
}
PROPERTIES FOLDER
"3rdparty"
)
endif
()
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
COMPONENT main
)
install
(
TARGETS
${
ZLIB_LIBRARY
}
ARCHIVE DESTINATION share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
COMPONENT main
)
endif
()
CMakeLists.txt
浏览文件 @
a8f0c933
...
...
@@ -148,6 +148,9 @@ OCV_OPTION(BUILD_TESTS "Build accuracy & regression tests"
OCV_OPTION
(
BUILD_WITH_DEBUG_INFO
"Include debug info into debug libs"
ON
)
OCV_OPTION
(
BUILD_WITH_STATIC_CRT
"Enables use of staticaly linked CRT for staticaly linked OpenCV"
ON IF MSVC
)
# 3rdparty libs
OCV_OPTION
(
BUILD_ZLIB
"Build zlib from source instead of installed in the system"
WIN32 OR IOS
)
if
(
WIN32 OR ANDROID
)
set
(
OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE INTERNAL
"Build 3rd party libraries"
)
else
()
...
...
@@ -424,7 +427,6 @@ endif()
if
(
UNIX OR WIN32
)
if
(
NOT OPENCV_BUILD_3RDPARTY_LIBS
)
message
(
STATUS
"NOT OPENCV_BUILD_3RDPARTY_LIBS **************************************************"
)
include
(
FindZLIB
)
if
(
WITH_PNG
)
include
(
FindPNG
)
if
(
PNG_FOUND
)
...
...
@@ -468,12 +470,26 @@ if(WITH_JASPER AND NOT JASPER_FOUND)
set
(
JASPER_LIBRARIES libjasper
)
endif
()
################### zlib - always required
if
(
NOT BUILD_ZLIB
)
if
(
ANDROID
)
set
(
ZLIB_FOUND TRUE
)
set
(
ZLIB_LIBRARY z
)
set
(
ZLIB_INCLUDE_DIR
""
)
else
()
include
(
FindZLIB
)
endif
()
else
()
set
(
ZLIB_FOUND FALSE
)
endif
()
if
(
NOT ZLIB_FOUND
)
set
(
ZLIB_LIBRARY zlib
)
add_subdirectory
(
3rdparty/zlib
)
set
(
ZLIB_INCLUDE_DIR
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/zlib"
"
${${
ZLIB_LIBRARY
}
_BINARY_DIR
}
"
)
endif
()
#message(STATUS "Graphic libraries: ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES}")
################### OpenEXR
if
(
WITH_OPENEXR
)
include
(
cmake/OpenCVFindOpenEXR.cmake
)
endif
()
...
...
@@ -775,7 +791,7 @@ status(" OpenGL support:" HAVE_OPENGL THEN YES ELSE NO)
# media
status
(
""
)
status
(
" Media I/O: "
)
status
(
" ZLib:"
ZLIB_FOUND THEN
${
ZLIB_FOUND
}
ELSE build
)
status
(
" ZLib:"
ZLIB_FOUND THEN
"
${
ZLIB_FOUND
}
-
${
ZLIB_LIBRARY
}
"
ELSE build
)
status
(
" JPEG:"
NOT WITH_JPEG OR JPEG_FOUND THEN
${
JPEG_FOUND
}
ELSE build
)
status
(
" PNG:"
NOT WITH_PNG OR PNG_FOUND THEN
${
PNG_FOUND
}
ELSE build
)
status
(
" TIFF:"
NOT WITH_TIFF OR TIFF_FOUND THEN
${
TIFF_FOUND
}
ELSE build
)
...
...
modules/core/CMakeLists.txt
浏览文件 @
a8f0c933
set
(
the_description
"The Core Functionality"
)
ocv_add_module
(
core
${
ZLIB_LIBRARY
}
)
if
(
NOT ZLIB_FOUND
)
set
(
ZLIB_INCLUDE_DIR
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../3rdparty/zlib"
)
endif
()
ocv_module_include_directories
(
${
ZLIB_INCLUDE_DIR
}
)
if
(
HAVE_CUDA
)
...
...
modules/highgui/CMakeLists.txt
浏览文件 @
a8f0c933
...
...
@@ -10,13 +10,8 @@ ocv_add_module(highgui opencv_imgproc OPTIONAL opencv_androidcamera)
set
(
GRFMT_LIBS
""
)
if
(
WITH_PNG OR WITH_TIFF OR WITH_OPENEXR
)
if
(
ZLIB_FOUND
)
include_directories
(
${
ZLIB_INCLUDE_DIR
}
)
set
(
GRFMT_LIBS
${
GRFMT_LIBS
}
${
ZLIB_LIBRARIES
}
)
else
()
include_directories
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../3rdparty/zlib"
)
set
(
GRFMT_LIBS
${
GRFMT_LIBS
}
zlib
)
endif
()
set
(
GRFMT_LIBS
${
GRFMT_LIBS
}
${
ZLIB_LIBRARY
}
)
endif
()
if
(
WITH_JPEG
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录