diff --git a/opencv b/opencv index 7b4468969..410b05cbe 160000 --- a/opencv +++ b/opencv @@ -1 +1 @@ -Subproject commit 7b44689693ce559b073cdd1b58daf25eb3c27c30 +Subproject commit 410b05cbe786bb104c6235727288875603219f41 diff --git a/platforms/osx/configure b/platforms/osx/configure index 7cabb5930..83c13671b 100755 --- a/platforms/osx/configure +++ b/platforms/osx/configure @@ -1,5 +1,13 @@ #!/usr/bin/env bash cd ../.. -cmake -DCMAKE_OSX_ARCHITECTURES=i386 -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk -DBUILD_TESTING:BOOL=OFF . + +cd vtk +cmake -DCMAKE_OSX_ARCHITECTURES=i386 -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE:BOOL=Release . +make +cd .. + +cmake -DCMAKE_OSX_ARCHITECTURES=i386 -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk . +make + cd platforms/osx \ No newline at end of file diff --git a/platforms/osx/configure_universal b/platforms/osx/configure_universal index 37471fd0e..77efc6350 100755 --- a/platforms/osx/configure_universal +++ b/platforms/osx/configure_universal @@ -1,5 +1,12 @@ #!/usr/bin/env bash cd ../.. -cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;i386" -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk -DBUILD_TESTING:BOOL=OFF . + +cd vtk +cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;i386" -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE:BOOL=Release . +make +cd .. + +cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;i386" -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk . +make cd platforms/osx \ No newline at end of file diff --git a/platforms/raspbian/cmake_configure b/platforms/raspbian/cmake_configure index a67228ed0..e3e21cfbe 100755 --- a/platforms/raspbian/cmake_configure +++ b/platforms/raspbian/cmake_configure @@ -1,3 +1,9 @@ cd ../.. -cmake -DBUILD_TESTS:BOOL=FALSE -DBUILD_PERF_TESTS:BOOL=FALSE -DBUILD_opencv_apps:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DWITH_TBB:BOOL=FALSE -DWITH_OPENMP:BOOL=TRUE -DWITH_CUDA:BOOL=FALSE -DWITH_OPENCL:BOOL=FALSE -DWITH_IPP:BOOL=FALSE -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules -DBUILD_opencv_ts:BOOL=FALSE -DBUILD_WITH_DEBUG_INFO:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_DIR:String="$PWD/vtk" -DBUILD_TESTING:BOOL=FALSE -DCMAKE_BUILD_TYPE:String="Release" . +cd vtk +CFLAGS=-fPIC CXXFLAGS=-fPIC cmake -DBUILD_TESTING:BOOL=FALSE -DCMAKE_BUILD_TYPE:String="Release" -DBUILD_WITH_DEBUG_INFO:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE . +make +cd .. + +cmake -DBUILD_TESTS:BOOL=FALSE -DBUILD_PERF_TESTS:BOOL=FALSE -DBUILD_opencv_apps:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DWITH_TBB:BOOL=FALSE -DWITH_OPENMP:BOOL=TRUE -DWITH_CUDA:BOOL=FALSE -DWITH_OPENCL:BOOL=FALSE -DWITH_IPP:BOOL=FALSE -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules -DBUILD_opencv_ts:BOOL=FALSE -DBUILD_WITH_DEBUG_INFO:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_DIR:String="$PWD/vtk" -DCMAKE_BUILD_TYPE:String="Release" . +make cd platforms/raspbian \ No newline at end of file diff --git a/platforms/ubuntu/16.04/cmake_configure.sh b/platforms/ubuntu/16.04/cmake_configure.sh index 454d11e40..b5442a7f6 100755 --- a/platforms/ubuntu/16.04/cmake_configure.sh +++ b/platforms/ubuntu/16.04/cmake_configure.sh @@ -1,5 +1,12 @@ #!/bin/sh cd ../../.. -cmake -DBUILD_TESTS:BOOL=FALSE -DBUILD_PERF_TESTS:BOOL=FALSE -DBUILD_opencv_apps:BOOL=FALSE -DBUILD_opencv_python2:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DWITH_TBB:BOOL=TRUE -DWITH_CUDA:BOOL=FALSE -DWITH_OPENCL:BOOL=FALSE -DWITH_IPP:BOOL=FALSE -DWITH_EIGEN:BOOL=FALSE -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules -DBUILD_opencv_ts:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_DIR:String="$PWD/vtk" -DBUILD_TESTING:BOOL=FALSE -DCMAKE_BUILD_TYPE:String="Release" . + +cd vtk +CFLAGS=-fPIC CXXFLAGS=-fPIC cmake -DBUILD_TESTING:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DCMAKE_BUILD_TYPE:STRING="RELEASE" . +make +cd .. + +cmake -DBUILD_TESTS:BOOL=FALSE -DBUILD_PERF_TESTS:BOOL=FALSE -DBUILD_opencv_apps:BOOL=FALSE -DBUILD_opencv_python2:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DWITH_TBB:BOOL=TRUE -DWITH_CUDA:BOOL=FALSE -DWITH_OPENCL:BOOL=FALSE -DWITH_IPP:BOOL=FALSE -DWITH_EIGEN:BOOL=FALSE -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib/modules -DBUILD_opencv_ts:BOOL=FALSE -DBUILD_SHARED_LIBS:BOOL=FALSE -DVTK_DIR:String="$PWD/vtk" -DCMAKE_BUILD_TYPE:String="Release" . +make cd platforms/ubuntu/16.04