Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
465ae048
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,发现更多精彩内容 >>
提交
465ae048
编写于
10月 24, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12887 from alalek:fix_cmake_conditions
上级
dbed39a9
d6a8e08a
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
20 addition
and
16 deletion
+20
-16
CMakeLists.txt
CMakeLists.txt
+4
-0
cmake/OpenCVCompilerOptimizations.cmake
cmake/OpenCVCompilerOptimizations.cmake
+3
-3
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVDetectCUDA.cmake
+2
-2
cmake/OpenCVDetectVTK.cmake
cmake/OpenCVDetectVTK.cmake
+4
-4
cmake/OpenCVFindIPP.cmake
cmake/OpenCVFindIPP.cmake
+2
-2
cmake/OpenCVFindMKL.cmake
cmake/OpenCVFindMKL.cmake
+1
-1
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+2
-2
cmake/OpenCVPackaging.cmake
cmake/OpenCVPackaging.cmake
+1
-1
cmake/templates/OpenCVConfig-CUDA.cmake.in
cmake/templates/OpenCVConfig-CUDA.cmake.in
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
465ae048
...
...
@@ -96,6 +96,10 @@ if(POLICY CMP0051)
cmake_policy
(
SET CMP0051 NEW
)
endif
()
if
(
POLICY CMP0054
)
# CMake 3.1: Only interpret if() arguments as variables or keywords when unquoted.
cmake_policy
(
SET CMP0054 NEW
)
endif
()
if
(
POLICY CMP0056
)
cmake_policy
(
SET CMP0056 NEW
)
endif
()
...
...
cmake/OpenCVCompilerOptimizations.cmake
浏览文件 @
465ae048
...
...
@@ -50,13 +50,13 @@ endforeach()
# process legacy flags
macro
(
ocv_optimization_process_obsolete_option legacy_flag OPT legacy_warn
)
if
(
DEFINED
${
legacy_flag
}
)
if
(
${
legacy_warn
}
)
if
(
DEFINED
"
${
legacy_flag
}
"
)
if
(
"
${
legacy_warn
}
"
)
message
(
STATUS
"WARNING: Option
${
legacy_flag
}
='
${${
legacy_flag
}}
' is deprecated and should not be used anymore"
)
message
(
STATUS
" Behaviour of this option is not backward compatible"
)
message
(
STATUS
" Refer to 'CPU_BASELINE'/'CPU_DISPATCH' CMake options documentation"
)
endif
()
if
(
${
legacy_flag
}
)
if
(
"
${
legacy_flag
}
"
)
if
(
NOT
";
${
CPU_BASELINE_REQUIRE
}
;"
MATCHES
";
${
OPT
}
;"
)
set
(
CPU_BASELINE_REQUIRE
"
${
CPU_BASELINE_REQUIRE
}
;
${
OPT
}
"
CACHE STRING
"
${
HELP_CPU_BASELINE_REQUIRE
}
"
FORCE
)
endif
()
...
...
cmake/OpenCVDetectCUDA.cmake
浏览文件 @
465ae048
...
...
@@ -122,9 +122,9 @@ if(CUDA_FOUND)
endif
()
set
(
__cuda_arch_ptx
""
)
else
()
if
(
${
CUDA_VERSION
}
VERSION_LESS
"9.0"
)
if
(
CUDA_VERSION
VERSION_LESS
"9.0"
)
set
(
__cuda_arch_bin
"2.0 3.0 3.5 3.7 5.0 5.2 6.0 6.1"
)
elseif
(
${
CUDA_VERSION
}
VERSION_LESS
"10.0"
)
elseif
(
CUDA_VERSION
VERSION_LESS
"10.0"
)
set
(
__cuda_arch_bin
"3.0 3.5 3.7 5.0 5.2 6.0 6.1 7.0"
)
else
()
set
(
__cuda_arch_bin
"3.0 3.5 3.7 5.0 5.2 6.0 6.1 7.0 7.5"
)
...
...
cmake/OpenCVDetectVTK.cmake
浏览文件 @
465ae048
...
...
@@ -20,27 +20,27 @@ if(NOT VTK_FOUND)
endif
()
# Don't support earlier VTKs
if
(
${
VTK_VERSION
}
VERSION_LESS
"5.8.0"
)
if
(
VTK_VERSION
VERSION_LESS
"5.8.0"
)
message
(
STATUS
"VTK support is disabled. VTK ver. 5.8.0 is minimum required, but found VTK ver.
${
VTK_VERSION
}
"
)
return
()
endif
()
# Different Qt versions can't be linked together
if
(
HAVE_QT5 AND
${
VTK_VERSION
}
VERSION_LESS
"6.0.0"
)
if
(
HAVE_QT5 AND
VTK_VERSION
VERSION_LESS
"6.0.0"
)
if
(
VTK_USE_QT
)
message
(
STATUS
"VTK support is disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.
${
VTK_VERSION
}
+ Qt4"
)
endif
()
endif
()
# Different Qt versions can't be linked together. VTK 6.0.0 doesn't provide a way to get Qt version it was linked with
if
(
HAVE_QT5 AND
${
VTK_VERSION
}
VERSION_EQUAL
"6.0.0"
AND NOT DEFINED FORCE_VTK
)
if
(
HAVE_QT5 AND
VTK_VERSION
VERSION_EQUAL
"6.0.0"
AND NOT DEFINED FORCE_VTK
)
message
(
STATUS
"VTK support is disabled. Possible incompatible combination: OpenCV+Qt5, and VTK ver.
${
VTK_VERSION
}
with Qt4"
)
message
(
STATUS
"If it is known that VTK was compiled without Qt4, please define '-DFORCE_VTK=TRUE' flag in CMake"
)
return
()
endif
()
# Different Qt versions can't be linked together
if
(
HAVE_QT AND
${
VTK_VERSION
}
VERSION_GREATER
"6.0.0"
AND NOT
${
VTK_QT_VERSION
}
STREQUAL
""
)
if
(
HAVE_QT AND
VTK_VERSION
VERSION_GREATER
"6.0.0"
AND NOT
${
VTK_QT_VERSION
}
STREQUAL
""
)
if
(
HAVE_QT5 AND
${
VTK_QT_VERSION
}
EQUAL
"4"
)
message
(
STATUS
"VTK support is disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.
${
VTK_VERSION
}
+ Qt4"
)
return
()
...
...
cmake/OpenCVFindIPP.cmake
浏览文件 @
465ae048
...
...
@@ -105,7 +105,7 @@ macro(ipp_detect_version)
message
(
STATUS
"found Intel IPP
${
__msg
}
:
${
_MAJOR
}
.
${
_MINOR
}
.
${
_BUILD
}
[
${
IPP_VERSION_STR
}
]"
)
message
(
STATUS
"at:
${
IPP_ROOT_DIR
}
"
)
if
(
${
IPP_VERSION_STR
}
VERSION_LESS
"7.0"
)
if
(
IPP_VERSION_STR
VERSION_LESS
"7.0"
)
_ipp_not_supported
(
"Intel IPP
${
IPP_VERSION_STR
}
is not supported"
)
endif
()
...
...
@@ -166,7 +166,7 @@ macro(ipp_detect_version)
endmacro
()
set
(
IPP_PREFIX
"ipp"
)
if
(
${
IPP_VERSION_STR
}
VERSION_LESS
"8.0"
)
if
(
IPP_VERSION_STR
VERSION_LESS
"8.0"
)
if
(
BUILD_WITH_DYNAMIC_IPP AND NOT HAVE_IPP_ICV
)
set
(
IPP_SUFFIX
""
)
# dynamic not threaded libs suffix Intel IPP 7.x
else
()
...
...
cmake/OpenCVFindMKL.cmake
浏览文件 @
465ae048
...
...
@@ -94,7 +94,7 @@ else()
set
(
MKL_ARCH_SUFFIX
"c"
)
endif
()
if
(
${
MKL_VERSION_STR
}
VERSION_GREATER
"11.3.0"
OR
${
MKL_VERSION_STR
}
VERSION_EQUAL
"11.3.0"
)
if
(
MKL_VERSION_STR VERSION_GREATER
"11.3.0"
OR MKL_VERSION_STR
VERSION_EQUAL
"11.3.0"
)
set
(
mkl_lib_find_paths
${
MKL_ROOT_DIR
}
/lib
${
MKL_ROOT_DIR
}
/lib/
${
MKL_ARCH
}
${
MKL_ROOT_DIR
}
/../tbb/lib/
${
MKL_ARCH
}
)
...
...
cmake/OpenCVModule.cmake
浏览文件 @
465ae048
...
...
@@ -615,7 +615,7 @@ function(__ocv_resolve_dependencies)
list
(
APPEND LINK_DEPS opencv_world
)
endif
()
endif
()
if
(
${
m
}
STREQUAL opencv_world
)
if
(
"
${
m
}
"
STREQUAL opencv_world
)
list
(
APPEND OPENCV_MODULE_opencv_world_DEPS_EXT
${
OPENCV_MODULE_
${
m2
}
_DEPS_EXT
}
)
endif
()
endif
()
...
...
@@ -842,7 +842,7 @@ macro(ocv_create_module)
if
(
NOT
"
${
ARGN
}
"
STREQUAL
" "
)
set
(
OPENCV_MODULE_
${
the_module
}
_LINK_DEPS
"
${
OPENCV_MODULE_
${
the_module
}
_LINK_DEPS
}
;
${
ARGN
}
"
CACHE INTERNAL
""
)
endif
()
if
(
${
BUILD_opencv_world
}
AND OPENCV_MODULE_
${
the_module
}
_IS_PART_OF_WORLD
)
if
(
BUILD_opencv_world
AND OPENCV_MODULE_
${
the_module
}
_IS_PART_OF_WORLD
)
# nothing
set
(
the_module_target opencv_world
)
else
()
...
...
cmake/OpenCVPackaging.cmake
浏览文件 @
465ae048
...
...
@@ -89,7 +89,7 @@ set(CPACK_COMPONENT_TESTS_DEPENDS libs)
if
(
HAVE_CUDA
)
string
(
REPLACE
"."
"-"
cuda_version_suffix
${
CUDA_VERSION
}
)
if
(
${
CUDA_VERSION
}
VERSION_LESS
"6.5"
)
if
(
CUDA_VERSION
VERSION_LESS
"6.5"
)
set
(
CPACK_DEB_libs_PACKAGE_DEPENDS
"cuda-core-libs-
${
cuda_version_suffix
}
, cuda-extra-libs-
${
cuda_version_suffix
}
"
)
set
(
CPACK_DEB_dev_PACKAGE_DEPENDS
"cuda-headers-
${
cuda_version_suffix
}
"
)
else
()
...
...
cmake/templates/OpenCVConfig-CUDA.cmake.in
浏览文件 @
465ae048
...
...
@@ -16,7 +16,7 @@ endif()
set(OpenCV_CUDA_LIBS_ABSPATH ${CUDA_LIBRARIES})
if(
${CUDA_VERSION}
VERSION_LESS "5.5")
if(
CUDA_VERSION
VERSION_LESS "5.5")
list(APPEND OpenCV_CUDA_LIBS_ABSPATH ${CUDA_npp_LIBRARY})
else()
find_cuda_helper_libs(nppc)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录