generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ignore viz tutorials when BUILD_opencv_viz is not set

Browse Source
This commit is contained in:
Ozan Tonkal 2013-09-17 18:55:10 +02:00
parent e3e5fd5baa
commit a117400577
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/viz/test/test_viz3d.cpp
View File

@ -124,8 +124,8 @@ TEST(Viz_viz3d, accuracy)
int row_max = img.rows/downSample; int row_max = img.rows/downSample;
int col_max = img.cols/downSample; int col_max = img.cols/downSample;
cv::Mat clouds[img.cols/downSample]; cv::Mat *clouds = new cv::Mat[img.cols/downSample];
cv::Mat colors[img.cols/downSample]; cv::Mat *colors = new cv::Mat[img.cols/downSample];
for (int col = 0; col < col_max; ++col) for (int col = 0; col < col_max; ++col)
{ {

11
samples/cpp/CMakeLists.txt
View File

@ -28,6 +28,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
if(HAVE_opencv_gpufilters) if(HAVE_opencv_gpufilters)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include") ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include")
endif() endif()
if(HAVE_opencv_viz)
ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/viz/include")
endif()
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
@ -56,6 +59,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
target_link_libraries(${the_target} opencv_gpuarithm opencv_gpufilters) target_link_libraries(${the_target} opencv_gpuarithm opencv_gpufilters)
endif() endif()
if(HAVE_opencv_viz)
target_link_libraries(${the_target} opencv_viz)
endif()
set_target_properties(${the_target} PROPERTIES set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "cpp-${sample_kind}-${name}" OUTPUT_NAME "cpp-${sample_kind}-${name}"
PROJECT_LABEL "(${sample_KIND}) ${name}") PROJECT_LABEL "(${sample_KIND}) ${name}")
@ -83,6 +90,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
ocv_list_filterout(cpp_samples "/gpu/") ocv_list_filterout(cpp_samples "/gpu/")
endif() endif()
if(NOT HAVE_opencv_viz)
ocv_list_filterout(cpp_samples "viz")
endif()
foreach(sample_filename ${cpp_samples}) foreach(sample_filename ${cpp_samples})
get_filename_component(sample ${sample_filename} NAME_WE) get_filename_component(sample ${sample_filename} NAME_WE)
OPENCV_DEFINE_CPP_EXAMPLE(${sample} ${sample_filename}) OPENCV_DEFINE_CPP_EXAMPLE(${sample} ${sample_filename})