Commit d6cc8fd9 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'opencv-cleanups'

f80ee24b cmb.unix: reindent code
4e1ac9bd opencv: remove unused code
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !194
parents 141395ed f80ee24b
set(opencv_extra_cmake_args)
if (WIN32)
list(APPEND opencv_extra_cmake_args
-DOpenCV_DIR:PATH=<INSTALL_DIR>/share)
endif ()
superbuild_add_project(opencv
DEPENDS
python qt4 opencvcontrib numpy
......
......@@ -10,14 +10,15 @@ endif ()
set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
if (executable STREQUAL "GrabCuts")
if (executable STREQUAL "GrabCuts")
superbuild_unix_install_program("${superbuild_install_location}/bin/${executable}"
"lib" SEARCH_DIRECTORIES "${library_paths}")
else()
superbuild_unix_install_program_fwd("${executable}"
"lib/paraview-${paraview_version};lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}")
endif()
"lib"
SEARCH_DIRECTORIES "${library_paths}")
else ()
superbuild_unix_install_program_fwd("${executable}"
"lib/paraview-${paraview_version};lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}")
endif ()
list(APPEND plugins
${cmb_plugins_${executable}})
endforeach ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment