Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ece71d6a
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
ece71d6a
编写于
9月 15, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove misused REQUIRED keyword from CMake scripts
上级
78e89890
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
24 addition
and
24 deletion
+24
-24
CMakeLists.txt
CMakeLists.txt
+21
-21
cmake/OpenCVFindLibsPerf.cmake
cmake/OpenCVFindLibsPerf.cmake
+2
-2
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVFindLibsVideo.cmake
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
ece71d6a
...
...
@@ -60,7 +60,7 @@ endif()
project
(
OpenCV CXX C
)
include
(
cmake/OpenCVUtils.cmake
REQUIRED
)
include
(
cmake/OpenCVUtils.cmake
)
# ----------------------------------------------------------------------------
# Break in case of popular CMake configuration mistakes
...
...
@@ -73,7 +73,7 @@ endif()
# ----------------------------------------------------------------------------
# Detect compiler and target platform architecture
# ----------------------------------------------------------------------------
include
(
cmake/OpenCVDetectCXXCompiler.cmake
REQUIRED
)
include
(
cmake/OpenCVDetectCXXCompiler.cmake
)
# Add these standard paths to the search paths for FIND_LIBRARY
# to find libraries from these locations first
...
...
@@ -212,7 +212,7 @@ include(cmake/OpenCVLegacyOptions.cmake OPTIONAL)
# ----------------------------------------------------------------------------
# Get actual OpenCV version number from sources
# ----------------------------------------------------------------------------
include
(
cmake/OpenCVVersion.cmake
REQUIRED
)
include
(
cmake/OpenCVVersion.cmake
)
# ----------------------------------------------------------------------------
...
...
@@ -329,7 +329,7 @@ if(CMAKE_GENERATOR MATCHES "Makefiles|Ninja" AND "${CMAKE_BUILD_TYPE}" STREQUAL
set
(
CMAKE_BUILD_TYPE Release
)
endif
()
include
(
cmake/OpenCVCompilerOptions.cmake
REQUIRED
)
include
(
cmake/OpenCVCompilerOptions.cmake
)
# ----------------------------------------------------------------------------
...
...
@@ -337,7 +337,7 @@ include(cmake/OpenCVCompilerOptions.cmake REQUIRED)
# Default: dynamic
# ----------------------------------------------------------------------------
if
(
MSVC
)
include
(
cmake/OpenCVCRTLinkage.cmake
REQUIRED
)
include
(
cmake/OpenCVCRTLinkage.cmake
)
endif
(
MSVC
)
if
(
WIN32 AND NOT MINGW
)
...
...
@@ -370,17 +370,17 @@ if(UNIX)
endif
()
endif
()
include
(
cmake/OpenCVPCHSupport.cmake
REQUIRED
)
include
(
cmake/OpenCVModule.cmake
REQUIRED
)
include
(
cmake/OpenCVPCHSupport.cmake
)
include
(
cmake/OpenCVModule.cmake
)
# ----------------------------------------------------------------------------
# Detect 3rd-party libraries
# ----------------------------------------------------------------------------
include
(
cmake/OpenCVFindLibsGrfmt.cmake
REQUIRED
)
include
(
cmake/OpenCVFindLibsGUI.cmake
REQUIRED
)
include
(
cmake/OpenCVFindLibsVideo.cmake
REQUIRED
)
include
(
cmake/OpenCVFindLibsPerf.cmake
REQUIRED
)
include
(
cmake/OpenCVFindLibsGrfmt.cmake
)
include
(
cmake/OpenCVFindLibsGUI.cmake
)
include
(
cmake/OpenCVFindLibsVideo.cmake
)
include
(
cmake/OpenCVFindLibsPerf.cmake
)
# ----------------------------------------------------------------------------
...
...
@@ -389,16 +389,16 @@ include(cmake/OpenCVFindLibsPerf.cmake REQUIRED)
# --- LATEX for pdf documentation ---
if
(
BUILD_DOCS
)
include
(
cmake/OpenCVFindLATEX.cmake
REQUIRED
)
include
(
cmake/OpenCVFindLATEX.cmake
)
endif
(
BUILD_DOCS
)
# --- Python Support ---
include
(
cmake/OpenCVDetectPython.cmake
REQUIRED
)
include
(
cmake/OpenCVDetectPython.cmake
)
# --- Java Support ---
if
(
ANDROID
)
include
(
cmake/OpenCVDetectApacheAnt.cmake
REQUIRED
)
include
(
cmake/OpenCVDetectAndroidSDK.cmake
REQUIRED
)
include
(
cmake/OpenCVDetectApacheAnt.cmake
)
include
(
cmake/OpenCVDetectAndroidSDK.cmake
)
if
(
NOT ANDROID_TOOLS_Pkg_Revision GREATER 13
)
message
(
WARNING
"OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled."
)
...
...
@@ -413,7 +413,7 @@ endif()
# --- OpenCL ---
if
(
WITH_OPENCL
)
include
(
cmake/OpenCVDetectOpenCL.cmake
REQUIRED
)
include
(
cmake/OpenCVDetectOpenCL.cmake
)
if
(
OPENCL_FOUND
)
set
(
HAVE_OPENCL 1
)
endif
()
...
...
@@ -434,7 +434,7 @@ if(ENABLE_SOLUTION_FOLDERS)
endif
()
# Extra OpenCV targets: uninstall, package_source, perf, etc.
include
(
cmake/OpenCVExtraTargets.cmake
REQUIRED
)
include
(
cmake/OpenCVExtraTargets.cmake
)
# ----------------------------------------------------------------------------
...
...
@@ -475,16 +475,16 @@ endif()
ocv_track_build_dependencies
()
# Generate platform-dependent and configuration-dependent headers
include
(
cmake/OpenCVGenHeaders.cmake
REQUIRED
)
include
(
cmake/OpenCVGenHeaders.cmake
)
# Generate opencv.pc for pkg-config command
include
(
cmake/OpenCVGenPkgconfig.cmake
REQUIRED
)
include
(
cmake/OpenCVGenPkgconfig.cmake
)
# Generate OpenCV.mk for ndk-build (Android build tool)
include
(
cmake/OpenCVGenAndroidMK.cmake
REQUIRED
)
include
(
cmake/OpenCVGenAndroidMK.cmake
)
# Generate OpenCVСonfig.cmake and OpenCVConfig-version.cmake for cmake projects
include
(
cmake/OpenCVGenConfig.cmake
REQUIRED
)
include
(
cmake/OpenCVGenConfig.cmake
)
# ----------------------------------------------------------------------------
...
...
cmake/OpenCVFindLibsPerf.cmake
浏览文件 @
ece71d6a
...
...
@@ -4,7 +4,7 @@
# --- TBB ---
if
(
WITH_TBB
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVDetectTBB.cmake"
REQUIRED
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVDetectTBB.cmake"
)
endif
(
WITH_TBB
)
# --- IPP ---
...
...
@@ -21,7 +21,7 @@ endif(WITH_IPP)
# --- CUDA ---
if
(
WITH_CUDA
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVDetectCUDA.cmake"
REQUIRED
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVDetectCUDA.cmake"
)
endif
(
WITH_CUDA
)
# --- Eigen ---
...
...
cmake/OpenCVFindLibsVideo.cmake
浏览文件 @
ece71d6a
...
...
@@ -98,7 +98,7 @@ endif(WITH_XIMEA)
ocv_clear_vars
(
HAVE_FFMPEG HAVE_FFMPEG_CODEC HAVE_FFMPEG_FORMAT HAVE_FFMPEG_UTIL HAVE_FFMPEG_SWSCALE HAVE_GENTOO_FFMPEG HAVE_FFMPEG_FFMPEG
)
if
(
WITH_FFMPEG
)
if
(
WIN32
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/ffmpeg/ffmpeg_version.cmake"
REQUIRED
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/3rdparty/ffmpeg/ffmpeg_version.cmake"
)
elseif
(
UNIX
)
CHECK_MODULE
(
libavcodec HAVE_FFMPEG_CODEC
)
CHECK_MODULE
(
libavformat HAVE_FFMPEG_FORMAT
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录