Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
65392d5e
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,发现更多精彩内容 >>
提交
65392d5e
编写于
12月 07, 2021
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: fix OPENGL_LIBRARIES handling
上级
35ff9af6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
3 addition
and
2 deletion
+3
-2
cmake/OpenCVFindLibsGUI.cmake
cmake/OpenCVFindLibsGUI.cmake
+0
-1
modules/core/CMakeLists.txt
modules/core/CMakeLists.txt
+1
-0
samples/cpp/CMakeLists.txt
samples/cpp/CMakeLists.txt
+1
-0
samples/opengl/CMakeLists.txt
samples/opengl/CMakeLists.txt
+1
-1
未找到文件。
cmake/OpenCVFindLibsGUI.cmake
浏览文件 @
65392d5e
...
...
@@ -101,7 +101,6 @@ if(WITH_OPENGL)
find_package
(
OpenGL QUIET
)
if
(
OPENGL_FOUND
)
set
(
HAVE_OPENGL TRUE
)
list
(
APPEND OPENCV_LINKER_LIBS
${
OPENGL_LIBRARIES
}
)
if
(
QT_QTOPENGL_FOUND
)
set
(
HAVE_QT_OPENGL TRUE
)
else
()
...
...
modules/core/CMakeLists.txt
浏览文件 @
65392d5e
...
...
@@ -107,6 +107,7 @@ ocv_create_module(${extra_libs})
ocv_target_link_libraries
(
${
the_module
}
PRIVATE
"
${
ZLIB_LIBRARIES
}
"
"
${
OPENCL_LIBRARIES
}
"
"
${
VA_LIBRARIES
}
"
"
${
OPENGL_LIBRARIES
}
"
"
${
LAPACK_LIBRARIES
}
"
"
${
CPUFEATURES_LIBRARIES
}
"
"
${
HALIDE_LIBRARIES
}
"
"
${
ITT_LIBRARIES
}
"
"
${
OPENCV_HAL_LINKER_LIBS
}
"
...
...
samples/cpp/CMakeLists.txt
浏览文件 @
65392d5e
...
...
@@ -56,6 +56,7 @@ foreach(sample_filename ${cpp_samples})
endif
()
if
(
HAVE_OPENGL AND sample_filename MATCHES
"detect_mser"
)
target_compile_definitions
(
${
tgt
}
PRIVATE HAVE_OPENGL
)
ocv_target_link_libraries
(
${
tgt
}
PRIVATE
"
${
OPENGL_LIBRARIES
}
"
)
endif
()
if
(
sample_filename MATCHES
"simd_"
)
# disabled intentionally - demonstration purposes only
...
...
samples/opengl/CMakeLists.txt
浏览文件 @
65392d5e
...
...
@@ -23,7 +23,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
endif
()
foreach
(
sample_filename
${
all_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
opengl
)
ocv_target_link_libraries
(
${
tgt
}
PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
PRIVATE
"
${
OPENGL_LIBRARIES
}
"
"
${
OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS
}
"
)
if
(
sample_filename STREQUAL
"opengl_interop.cpp"
)
ocv_target_link_libraries
(
${
tgt
}
PRIVATE
${
X11_LIBRARIES
}
)
ocv_target_include_directories
(
${
tgt
}
${
X11_INCLUDE_DIR
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录