Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
18151e79
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,发现更多精彩内容 >>
提交
18151e79
编写于
5月 14, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake(samples): use LINK_PRIVATE in target_link_libraries
上级
3e876c50
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
19 addition
and
19 deletion
+19
-19
samples/CMakeLists.example.in
samples/CMakeLists.example.in
+1
-1
samples/android/CMakeLists.txt
samples/android/CMakeLists.txt
+1
-1
samples/cpp/CMakeLists.txt
samples/cpp/CMakeLists.txt
+3
-3
samples/cpp/example_cmake/CMakeLists.txt
samples/cpp/example_cmake/CMakeLists.txt
+1
-1
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/CMakeLists.txt
...ial_code/calib3d/real_time_pose_estimation/CMakeLists.txt
+2
-2
samples/directx/CMakeLists.txt
samples/directx/CMakeLists.txt
+1
-1
samples/dnn/CMakeLists.txt
samples/dnn/CMakeLists.txt
+1
-1
samples/gpu/CMakeLists.txt
samples/gpu/CMakeLists.txt
+3
-3
samples/opencl/CMakeLists.txt
samples/opencl/CMakeLists.txt
+1
-1
samples/opengl/CMakeLists.txt
samples/opengl/CMakeLists.txt
+2
-2
samples/openvx/CMakeLists.txt
samples/openvx/CMakeLists.txt
+1
-1
samples/tapi/CMakeLists.txt
samples/tapi/CMakeLists.txt
+1
-1
samples/va_intel/CMakeLists.txt
samples/va_intel/CMakeLists.txt
+1
-1
未找到文件。
samples/CMakeLists.example.in
浏览文件 @
18151e79
...
...
@@ -39,4 +39,4 @@ message(STATUS " include path: ${OpenCV_INCLUDE_DIRS}")
add_executable(${EXAMPLE_NAME} "${EXAMPLE_FILE}")
# Link your application with OpenCV libraries
target_link_libraries(${EXAMPLE_NAME} ${OpenCV_LIBS})
target_link_libraries(${EXAMPLE_NAME}
LINK_PRIVATE
${OpenCV_LIBS})
samples/android/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -20,7 +20,7 @@ add_subdirectory(tutorial-4-opencl)
if
(
HAVE_opencv_highgui
)
add_executable
(
hello-android hello-android/main.cpp
)
ocv_target_include_modules_recurse
(
hello-android opencv_imgcodecs opencv_videoio opencv_highgui opencv_core opencv_imgproc
)
ocv_target_link_libraries
(
hello-android
${
OPENCV_LINKER_LIBS
}
opencv_imgcodecs opencv_videoio opencv_highgui opencv_core opencv_imgproc
)
ocv_target_link_libraries
(
hello-android
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
opencv_imgcodecs opencv_videoio opencv_highgui opencv_core opencv_imgproc
)
set_target_properties
(
hello-android PROPERTIES OUTPUT_NAME hello-android RUNTIME_OUTPUT_DIRECTORY
"
${
EXECUTABLE_OUTPUT_PATH
}
"
)
add_dependencies
(
opencv_android_examples hello-android
)
endif
()
samples/cpp/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -46,12 +46,12 @@ foreach(sample_filename ${cpp_samples})
set
(
package
"tutorial"
)
endif
()
ocv_define_sample
(
tgt
${
sample_filename
}
${
package
}
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CPP_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CPP_SAMPLES_REQUIRED_DEPS
}
)
if
(
sample_filename MATCHES
"/gpu/"
AND HAVE_opencv_cudaarithm AND HAVE_opencv_cuda_filters
)
ocv_target_link_libraries
(
${
tgt
}
opencv_cudaarithm opencv_cudafilters
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
opencv_cudaarithm opencv_cudafilters
)
endif
()
if
(
sample_filename MATCHES
"/viz/"
)
ocv_target_link_libraries
(
${
tgt
}
${
VTK_LIBRARIES
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
VTK_LIBRARIES
}
)
target_compile_definitions
(
${
tgt
}
PRIVATE -DUSE_VTK
)
endif
()
if
(
HAVE_OPENGL AND sample_filename MATCHES
"detect_mser"
)
...
...
samples/cpp/example_cmake/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -27,4 +27,4 @@ endif()
add_executable
(
opencv_example example.cpp
)
# Link your application with OpenCV libraries
target_link_libraries
(
opencv_example
${
OpenCV_LIBS
}
)
target_link_libraries
(
opencv_example
LINK_PRIVATE
${
OpenCV_LIBS
}
)
samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
add_executable
(
${
target
}
pnp_registration
${
sample_dir
}
main_registration.cpp
${
sample_pnplib
}
)
add_executable
(
${
target
}
pnp_detection
${
sample_dir
}
main_detection.cpp
${
sample_pnplib
}
)
ocv_target_link_libraries
(
${
target
}
pnp_registration
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CPP_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
target
}
pnp_detection
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CPP_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
target
}
pnp_registration LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CPP_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
target
}
pnp_detection LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CPP_SAMPLES_REQUIRED_DEPS
}
)
samples/directx/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${tgt} ${OPENCV_DIRECTX_SAMPLES_REQUIRED_DEPS})
file
(
GLOB all_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
all_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
directx
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_DIRECTX_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_DIRECTX_SAMPLES_REQUIRED_DEPS
}
)
endforeach
()
samples/dnn/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -18,5 +18,5 @@ ocv_include_modules_recurse(${OPENCV_DNN_SAMPLES_REQUIRED_DEPS})
file
(
GLOB_RECURSE dnn_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
dnn_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
dnn
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_DNN_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_DNN_SAMPLES_REQUIRED_DEPS
}
)
endforeach
()
samples/gpu/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -51,11 +51,11 @@ endif()
file
(
GLOB all_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
all_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
gpu
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CUDA_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_CUDA_SAMPLES_REQUIRED_DEPS
}
)
if
(
HAVE_opencv_xfeatures2d
)
ocv_target_link_libraries
(
${
tgt
}
opencv_xfeatures2d
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
opencv_xfeatures2d
)
endif
()
if
(
HAVE_opencv_cudacodec
)
ocv_target_link_libraries
(
${
tgt
}
opencv_cudacodec
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
opencv_cudacodec
)
endif
()
endforeach
()
samples/opencl/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -31,7 +31,7 @@ ocv_include_directories(${OpenCL_INCLUDE_DIR})
file
(
GLOB all_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
all_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
opencl
)
ocv_target_link_libraries
(
${
tgt
}
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_OPENCL_SAMPLES_REQUIRED_DEPS
}
${
OpenCL_LIBRARY
}
)
...
...
samples/opengl/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -23,9 +23,9 @@ 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
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS
}
)
if
(
sample_filename STREQUAL
"opengl_interop.cpp"
)
ocv_target_link_libraries
(
${
tgt
}
${
X11_LIBRARIES
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
X11_LIBRARIES
}
)
ocv_target_include_directories
(
${
tgt
}
${
X11_INCLUDE_DIR
}
)
endif
()
endforeach
()
...
...
samples/openvx/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -21,5 +21,5 @@ add_definitions(-DIVX_HIDE_INFO_WARNINGS)
file
(
GLOB_RECURSE cpp_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
cpp_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
openvx
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_OPENVX_SAMPLE_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_OPENVX_SAMPLE_REQUIRED_DEPS
}
)
endforeach
()
samples/tapi/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -22,5 +22,5 @@ ocv_include_modules_recurse(${OPENCV_TAPI_SAMPLES_REQUIRED_DEPS})
file
(
GLOB all_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
all_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
tapi
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_TAPI_SAMPLES_REQUIRED_DEPS
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_TAPI_SAMPLES_REQUIRED_DEPS
}
)
endforeach
()
samples/va_intel/CMakeLists.txt
浏览文件 @
18151e79
...
...
@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
file
(
GLOB all_samples RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
*.cpp
)
foreach
(
sample_filename
${
all_samples
}
)
ocv_define_sample
(
tgt
${
sample_filename
}
va_intel
)
ocv_target_link_libraries
(
${
tgt
}
${
OPENCV_LINKER_LIBS
}
${
OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS
}
${
VA_LIBRARIES
}
${
VA_INTEL_LIBRARIES
}
)
ocv_target_link_libraries
(
${
tgt
}
LINK_PRIVATE
${
OPENCV_LINKER_LIBS
}
${
OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS
}
${
VA_LIBRARIES
}
${
VA_INTEL_LIBRARIES
}
)
endforeach
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录