Commit ed70f504 authored by Jacob Becker's avatar Jacob Becker Committed by Kitware Robot

Merge topic 'add_opencv'

ad94b283 fix rpath issue
826f08d5 remove vtk requirement
512667a1 Merge remote-tracking branch 'origin/master' into add_opencv
3275ffee add comments
ad03e555 add vtk dir
b59fb240 add numpy to packaging
d4f85594 fixes for linux
df900d5b turn off dnn
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !166
parents 4b4e391e ad94b283
......@@ -30,7 +30,10 @@ function (superbuild_find_projects var)
kml
moab
netcdf
numpy
oce
opencv
opencvcontrib
paraview
png
python
......
......@@ -89,6 +89,8 @@ foreach(program IN LISTS cmb_programs_to_install)
"${program}.app"
MODULES smtk
shiboken
cv2
numpy
${python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
......
......@@ -24,7 +24,7 @@ superbuild_add_project(cmb
DEBUGGABLE
DEFAULT_ON
DEPENDS boost remus vxl kml gdal qt4 python paraview shiboken
cmbworkflows zeromq
cmbworkflows zeromq opencv
smtk # XXX(smtk): until the submodule works properly
DEPENDS_OPTIONAL moab smtk ${cmb_extra_optional_dependencies}
cxx11
......
superbuild_add_project(opencv
DEPENDS
python
qt4
opencvcontrib
numpy
CMAKE_ARGS
-DOPENCV_EXTRA_MODULES_PATH:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencvcontrib/src/opencvcontrib/modules
-DBUILD_opencv_hdf:BOOL=OFF
-DBUILD_opencv_dnn:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
)
superbuild_add_project(opencvcontrib
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
)
......@@ -40,6 +40,8 @@ superbuild_unix_install_python(
pygments
six
vtk
numpy
cv2
${python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
......
......@@ -58,6 +58,8 @@ superbuild_windows_install_python(
pygments
six
vtk
cv2
numpy
${python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/Lib/site-packages"
......
......@@ -37,6 +37,14 @@ superbuild_set_revision(vxl
URL "https://github.com/judajake/vxl/archive/44433e4bd8ca3eabe4e5441444bf2a050d689d45.tar.gz"
URL_MD5 6ca7a87bebb12338a45277b921af4277)
superbuild_set_revision(opencv
GIT_REPOSITORY "https://github.com/opencv/opencv.git"
GIT_TAG 74e997f15b20600895896e1a837a0bb3cbf7f07b ) #Master at Aug 11 2016
superbuild_set_revision(opencvcontrib
GIT_REPOSITORY "https://github.com/opencv/opencv_contrib.git"
GIT_TAG 73459049a323af2c88e89037b45fadb7085020fb ) #Master at Aug 11 2016
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
GIT_REPOSITORY "https://github.com/robertmaynard/zeromq4-x.git"
......
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