Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c474e27c
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,发现更多精彩内容 >>
提交
c474e27c
编写于
7月 09, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
One more fix for zlib search #1902
上级
6d3db499
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
26 addition
and
25 deletion
+26
-25
3rdparty/zlib/CMakeLists.txt
3rdparty/zlib/CMakeLists.txt
+0
-3
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVDetectCUDA.cmake
+1
-1
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVFindLibsGrfmt.cmake
+7
-7
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+18
-14
未找到文件。
3rdparty/zlib/CMakeLists.txt
浏览文件 @
c474e27c
...
...
@@ -97,6 +97,3 @@ endif()
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
ZLIB_LIBRARY
}
ARCHIVE DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT main
)
endif
()
ocv_parse_header2
(
ZLIB
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/zlib.h"
ZLIB_VERSION PARENT_SCOPE
)
cmake/OpenCVDetectCUDA.cmake
浏览文件 @
c474e27c
if
(
${
CMAKE_VERSION
}
VERSION_LESS
"2.8.3"
)
message
(
STATUS
WITH_CUDA flag requires CMake 2.8.3. CUDA support is disabled.
)
message
(
STATUS
"WITH_CUDA flag requires CMake 2.8.3 or newer. CUDA support is disabled."
)
return
()
endif
()
...
...
cmake/OpenCVFindLibsGrfmt.cmake
浏览文件 @
c474e27c
...
...
@@ -7,13 +7,6 @@ if(BUILD_ZLIB)
ocv_clear_vars
(
ZLIB_FOUND
)
else
()
include
(
FindZLIB
)
if
(
ZLIB_VERSION_STRING
)
#cmake 2.8.2 bug - it fails to determine zlib version
unset
(
ZLIB_VERSION_STRING CACHE
)
endif
()
if
(
ZLIB_FOUND
)
ocv_parse_header2
(
ZLIB
"
${
ZLIB_INCLUDE_DIR
}
/zlib.h"
ZLIB_VERSION
""
)
endif
()
if
(
ZLIB_FOUND AND ANDROID
)
if
(
ZLIB_LIBRARY STREQUAL
"
${
ANDROID_SYSROOT
}
/usr/lib/libz.so"
)
set
(
ZLIB_LIBRARY z
)
...
...
@@ -29,6 +22,8 @@ if(NOT ZLIB_FOUND)
set
(
ZLIB_LIBRARIES
${
ZLIB_LIBRARY
}
)
add_subdirectory
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/zlib"
)
set
(
ZLIB_INCLUDE_DIR
"
${${
ZLIB_LIBRARY
}
_SOURCE_DIR
}
"
"
${${
ZLIB_LIBRARY
}
_BINARY_DIR
}
"
)
ocv_parse_header2
(
ZLIB
"
${${
ZLIB_LIBRARY
}
_SOURCE_DIR
}
/zlib.h"
ZLIB_VERSION
)
endif
()
# --- libtiff (optional, should be searched after zlib) ---
...
...
@@ -149,3 +144,8 @@ set(PNG_VERSION "${PNG_LIBPNG_VER_MAJOR}.${PNG_LIBPNG_VER_MINOR}.${PNG_LIBPNG_VE
if
(
WITH_OPENEXR
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVFindOpenEXR.cmake"
)
endif
()
#cmake 2.8.2 bug - it fails to determine zlib version
if
(
ZLIB_FOUND
)
ocv_parse_header2
(
ZLIB
"
${
ZLIB_INCLUDE_DIR
}
/zlib.h"
ZLIB_VERSION
)
endif
()
\ No newline at end of file
cmake/OpenCVUtils.cmake
浏览文件 @
c474e27c
...
...
@@ -468,32 +468,36 @@ macro(ocv_parse_header FILENAME FILE_VAR)
endmacro
()
# read single version define from the header file
macro
(
ocv_parse_header2 LIBNAME HDR_PATH VARNAME SCOPE
)
macro
(
ocv_parse_header2 LIBNAME HDR_PATH VARNAME
)
ocv_clear_vars
(
${
LIBNAME
}
_VERSION_MAJOR
${
LIBNAME
}
_VERSION_MAJOR
${
LIBNAME
}
_VERSION_MINOR
${
LIBNAME
}
_VERSION_PATCH
${
LIBNAME
}
_VERSION_TWEAK
${
LIBNAME
}
_VERSION_STRING
)
set
(
${
LIBNAME
}
_H
""
)
if
(
EXISTS
"
${
HDR_PATH
}
"
)
file
(
STRINGS
"
${
HDR_PATH
}
"
${
LIBNAME
}
_H REGEX
"^#define[
\t
]+
${
VARNAME
}
[
\t
]+
\"
[^
\"
]*
\"
.*$"
LIMIT_COUNT 1
)
endif
()
if
(
${
LIBNAME
}
_H
)
string
(
REGEX REPLACE
"^.*[
\t
]
${
VARNAME
}
[
\t
]+
\"
([0-9]+).*$"
"
\\
1"
${
LIBNAME
}
_VERSION_MAJOR
"
${${
LIBNAME
}
_H
}
"
)
string
(
REGEX REPLACE
"^.*[
\t
]
${
VARNAME
}
[
\t
]+
\"
[0-9]+
\\
.([0-9]+).*$"
"
\\
1"
${
LIBNAME
}
_VERSION_MINOR
"
${${
LIBNAME
}
_H
}
"
)
string
(
REGEX REPLACE
"^.*[
\t
]
${
VARNAME
}
[
\t
]+
\"
[0-9]+
\\
.[0-9]+
\\
.([0-9]+).*$"
"
\\
1"
${
LIBNAME
}
_VERSION_PATCH
"
${${
LIBNAME
}
_H
}
"
)
set
(
${
LIBNAME
}
_VERSION_MAJOR
${${
LIBNAME
}
_VERSION_MAJOR
}
${
SCOPE
}
)
set
(
${
LIBNAME
}
_VERSION_MINOR
${${
LIBNAME
}
_VERSION_MINOR
}
${
SCOPE
}
)
set
(
${
LIBNAME
}
_VERSION_PATCH
${${
LIBNAME
}
_VERSION_PATCH
}
${
SCOPE
}
)
set
(
${
LIBNAME
}
_VERSION_STRING
"
${${
LIBNAME
}
_VERSION_MAJOR
}
.
${${
LIBNAME
}
_VERSION_MINOR
}
.
${${
LIBNAME
}
_VERSION_PATCH
}
"
${
SCOPE
}
)
set
(
${
LIBNAME
}
_VERSION_MAJOR
${${
LIBNAME
}
_VERSION_MAJOR
}
${
ARGN
}
)
set
(
${
LIBNAME
}
_VERSION_MINOR
${${
LIBNAME
}
_VERSION_MINOR
}
${
ARGN
}
)
set
(
${
LIBNAME
}
_VERSION_PATCH
${${
LIBNAME
}
_VERSION_PATCH
}
${
ARGN
}
)
set
(
${
LIBNAME
}
_VERSION_STRING
"
${${
LIBNAME
}
_VERSION_MAJOR
}
.
${${
LIBNAME
}
_VERSION_MINOR
}
.
${${
LIBNAME
}
_VERSION_PATCH
}
"
)
# append a TWEAK version if it exists:
set
(
${
LIBNAME
}
_VERSION_TWEAK
""
)
if
(
"
${${
LIBNAME
}
_H
}
"
MATCHES
"^.*[
\t
]
${
VARNAME
}
[
\t
]+
\"
[0-9]+
\\
.[0-9]+
\\
.[0-9]+
\\
.([0-9]+).*$"
)
set
(
${
LIBNAME
}
_VERSION_TWEAK
"
${
CMAKE_MATCH_1
}
"
${
SCOPE
}
)
set
(
${
LIBNAME
}
_VERSION_STRING
"
${${
LIBNAME
}
_VERSION_STRING
}
.
${${
LIBNAME
}
_VERSION_TWEAK
}
"
${
SCOPE
}
)
set
(
${
LIBNAME
}
_VERSION_TWEAK
"
${
CMAKE_MATCH_1
}
"
${
ARGN
}
)
endif
()
if
(
${
LIBNAME
}
_VERSION_TWEAK
)
set
(
${
LIBNAME
}
_VERSION_STRING
"
${${
LIBNAME
}
_VERSION_STRING
}
.
${${
LIBNAME
}
_VERSION_TWEAK
}
"
${
ARGN
}
)
else
()
ocv_clear_vars
(
${
LIBNAME
}
_VERSION_MAJOR
${
LIBNAME
}
_VERSION_MAJOR
${
LIBNAME
}
_VERSION_MINOR
${
LIBNAME
}
_VERSION_PATCH
${
LIBNAME
}
_VERSION_TWEAK
${
LIBNAME
}
_VERSION_STRING
)
set
(
${
LIBNAME
}
_VERSION_STRING
"
${${
LIBNAME
}
_VERSION_STRING
}
"
${
ARGN
}
)
endif
()
endif
()
endmacro
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录