Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c42d47d9
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,发现更多精彩内容 >>
提交
c42d47d9
编写于
12月 02, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: clean cached INTERNAL variable used for 3rdparty deps
上级
aac30e77
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
1 deletion
+25
-1
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVFindLibsGrfmt.cmake
+7
-1
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+18
-0
未找到文件。
cmake/OpenCVFindLibsGrfmt.cmake
浏览文件 @
c42d47d9
...
...
@@ -6,6 +6,7 @@
if
(
BUILD_ZLIB
)
ocv_clear_vars
(
ZLIB_FOUND
)
else
()
ocv_clear_internal_cache_vars
(
ZLIB_LIBRARY ZLIB_INCLUDE_DIR
)
find_package
(
ZLIB
"
${
MIN_VER_ZLIB
}
"
)
if
(
ZLIB_FOUND AND ANDROID
)
if
(
ZLIB_LIBRARIES MATCHES
"/usr/(lib|lib32|lib64)/libz.so$"
)
...
...
@@ -31,11 +32,12 @@ if(WITH_JPEG)
if
(
BUILD_JPEG
)
ocv_clear_vars
(
JPEG_FOUND
)
else
()
ocv_clear_internal_cache_vars
(
JPEG_LIBRARY JPEG_INCLUDE_DIR
)
include
(
FindJPEG
)
endif
()
if
(
NOT JPEG_FOUND
)
ocv_clear_vars
(
JPEG_LIBRARY JPEG_
LIBRARIES JPEG_
INCLUDE_DIR
)
ocv_clear_vars
(
JPEG_LIBRARY JPEG_INCLUDE_DIR
)
if
(
NOT BUILD_JPEG_TURBO_DISABLE
)
set
(
JPEG_LIBRARY libjpeg-turbo CACHE INTERNAL
""
)
...
...
@@ -76,6 +78,7 @@ if(WITH_TIFF)
if
(
BUILD_TIFF
)
ocv_clear_vars
(
TIFF_FOUND
)
else
()
ocv_clear_internal_cache_vars
(
TIFF_LIBRARY TIFF_INCLUDE_DIR
)
include
(
FindTIFF
)
if
(
TIFF_FOUND
)
ocv_parse_header
(
"
${
TIFF_INCLUDE_DIR
}
/tiff.h"
TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION
)
...
...
@@ -119,6 +122,7 @@ if(WITH_WEBP)
if
(
BUILD_WEBP
)
ocv_clear_vars
(
WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR
)
else
()
ocv_clear_internal_cache_vars
(
WEBP_LIBRARY WEBP_INCLUDE_DIR
)
include
(
cmake/OpenCVFindWebP.cmake
)
if
(
WEBP_FOUND
)
set
(
HAVE_WEBP 1
)
...
...
@@ -184,6 +188,7 @@ if(WITH_PNG)
if
(
BUILD_PNG
)
ocv_clear_vars
(
PNG_FOUND
)
else
()
ocv_clear_internal_cache_vars
(
PNG_LIBRARY PNG_INCLUDE_DIR
)
include
(
FindPNG
)
if
(
PNG_FOUND
)
include
(
CheckIncludeFile
)
...
...
@@ -215,6 +220,7 @@ endif()
if
(
WITH_OPENEXR
)
ocv_clear_vars
(
HAVE_OPENEXR
)
if
(
NOT BUILD_OPENEXR
)
ocv_clear_internal_cache_vars
(
OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVFindOpenEXR.cmake"
)
endif
()
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
c42d47d9
...
...
@@ -400,6 +400,24 @@ macro(ocv_clear_vars)
endforeach
()
endmacro
()
# Clears passed variables with INTERNAL type from CMake cache
macro
(
ocv_clear_internal_cache_vars
)
foreach
(
_var
${
ARGN
}
)
get_property
(
_propertySet CACHE
${
_var
}
PROPERTY TYPE SET
)
if
(
_propertySet
)
get_property
(
_type CACHE
${
_var
}
PROPERTY TYPE
)
if
(
_type STREQUAL
"INTERNAL"
)
message
(
"Cleaning INTERNAL cached variable:
${
_var
}
"
)
unset
(
${
_var
}
CACHE
)
endif
()
endif
()
endforeach
()
unset
(
_propertySet
)
unset
(
_type
)
endmacro
()
set
(
OCV_COMPILER_FAIL_REGEX
"argument .* is not valid"
# GCC 9+ (including support of unicode quotes)
"command[- ]line option .* is valid for .* but not for C
\\
+
\\
+"
# GNU
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录