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

Merge topic 'bundle_grabcuts'

9f4cc814 add location of opencv for windows
0af4bc86 fix bundling on linux
0682f8c1 add grabcuts for bundling
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !184
parents 7b5387b4 9f4cc814
......@@ -5,6 +5,7 @@ set(cmb_package_name "CMB-Hydro")
set(cmb_programs_to_install
#GeologyBuilder
GrabCuts
SceneBuilder
ModelBuilder
MeshViewer
......
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
......@@ -13,3 +19,8 @@ superbuild_add_project(opencv
-DWITH_FFMPEG:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
if (WIN32)
superbuild_add_extra_cmake_args(
-DOpenCV_DIR:PATH=<INSTALL_DIR>/share)
endif ()
......@@ -10,9 +10,14 @@ endif ()
set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
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()
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