mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 00:03:03 +04:00
a18356853d
fix: include ptcloud header and dependency for opengl_testdata_generator sample #29293 ## Summary Fixes the build failure in samples/opengl/opengl_testdata_generator.cpp on the 5.x branch when building with BUILD_EXAMPLES=ON. ## Root cause The sample uses `loadMesh`, `TriangleShadingType`, and `TriangleCullingMode`, all declared in `modules/ptcloud/include/opencv2/ptcloud.hpp`. The sample did not include this header, and `samples/opengl/CMakeLists.txt` did not list `opencv_ptcloud` as a required dependency, so the ptcloud module headers/libs were not available when compiling this sample. ## Changes - Added `#include "opencv2/ptcloud.hpp"` to opengl_testdata_generator.cpp - Added `opencv_ptcloud` to `OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS` in samples/opengl/CMakeLists.txt ## Acceptance criteria - [x] opengl_testdata_generator.cpp compiles with BUILD_EXAMPLES=ON - [x] ptcloud module dependency declared so build system links it correctly Closes #29292
47 lines
1.4 KiB
CMake
47 lines
1.4 KiB
CMake
if(APPLE)
|
|
return()
|
|
endif()
|
|
|
|
if(UNIX)
|
|
find_package(X11 QUIET)
|
|
endif()
|
|
|
|
find_package(PkgConfig QUIET)
|
|
pkg_search_module(EPOXY QUIET epoxy)
|
|
|
|
SET(OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS
|
|
opencv_core
|
|
opencv_imgproc
|
|
opencv_imgcodecs
|
|
opencv_geometry
|
|
opencv_ptcloud
|
|
opencv_videoio
|
|
opencv_highgui)
|
|
ocv_check_dependencies(${OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS})
|
|
|
|
if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
|
project(opengl_samples)
|
|
ocv_include_modules_recurse(${OPENCV_OPENGL_SAMPLES_REQUIRED_DEPS})
|
|
file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
|
|
if(NOT X11_FOUND)
|
|
ocv_list_filterout(all_samples "opengl_interop")
|
|
endif()
|
|
if(NOT EPOXY_FOUND)
|
|
ocv_list_filterout(all_samples "opengl3_2")
|
|
endif()
|
|
foreach(sample_filename ${all_samples})
|
|
ocv_define_sample(tgt ${sample_filename} opengl)
|
|
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})
|
|
endif()
|
|
if(sample_filename STREQUAL "opengl3_2.cpp")
|
|
ocv_target_link_libraries(${tgt} PRIVATE ${EPOXY_LIBRARIES})
|
|
ocv_target_include_directories(${tgt} PRIVATE ${EPOXY_INCLUDE_DIRS})
|
|
endif()
|
|
endforeach()
|
|
endif()
|
|
|
|
ocv_install_example_src(opengl *.cpp *.hpp CMakeLists.txt)
|