c7fe162829
renamed **2 -> **
2014-02-04 19:55:11 +04:00
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
3d261e8a01
Reports path fix for opencv_run_all_tests.sh.in script.
2014-01-31 13:17:12 +04:00
0dad2876e2
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
...
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
2014-01-29 19:34:02 +04:00
d45350a06a
opencv_run_all_tests.sh script added to -tests package.
2014-01-29 16:31:24 +04:00
d9dc5ffa91
Multiple fixes for tests deb package build.
...
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
2014-01-28 16:32:26 +04:00
39201e68e2
Code review notes fixed.
...
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
2014-01-27 18:47:09 +04:00
f332cba14b
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
2014-01-27 15:49:24 +04:00
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
cc514ac7a9
added new macros useful for tracking whether OpenCL impl run or not
2014-01-24 17:16:40 +04:00
24caa80143
Merge pull request #2197 from asmorkalov:ocv_packaging2
2014-01-24 14:27:44 +04:00
086792ec06
Improvements in package build.
2014-01-24 12:00:44 +04:00
3715f71aaf
Merge pull request #2175 from vrabaud:2.4
2014-01-23 13:27:38 +04:00
167a26642e
fix message sent to user during cross_compilation
2014-01-22 15:26:14 +01:00
7821fe2bde
Initial Linux packages build rools for CPack.
2014-01-21 20:34:36 +04:00
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
eabcfa5652
reorder the if's for clarity
2014-01-21 10:27:37 +01:00
6cb90c0e97
fix cross-compilation issue with Numpy
2014-01-21 10:07:19 +01:00
8d327fa497
updated for compatibility with VTK6.0
2014-01-19 18:38:58 +04:00
9e3673ef53
Don't use PYTHON_VERSION_STRING when searching for Python libraries
...
It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.
2014-01-10 18:40:47 +04:00
7f795e964f
Merge commit 'ee36717d' into merge-2.4
2013-12-30 16:49:39 +04:00
719149877e
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
2013-12-27 12:43:49 +04:00
ee36717db4
Merge pull request #2037 from GregoryMorse:patch-2
2013-12-27 12:11:52 +04:00
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
4880858119
Update CMakeLists.txt
...
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
2013-12-26 19:45:21 +08:00
86aabf704f
Merge pull request #2050 from asmorkalov:android_mk_fix2
2013-12-26 14:16:29 +04:00
358e59e91b
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
2013-12-26 13:07:53 +04:00
83fe2f3b16
Fixed the seporate/seporator typo everywhere.
2013-12-25 14:04:44 +04:00
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
51d3138dff
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
2013-12-23 16:40:31 +04:00
58e7d9f32f
OpenCV.mk fixed for accurate CUDA support.
2013-12-23 12:58:12 +04:00
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
9941c6710d
NEON instruction set control unified for regular and cross-compiler builds.
2013-12-20 16:02:37 +04:00
037ffcdf99
Dynamic CUDA support library reimplemented as OpenCV module.
2013-12-19 16:42:11 +04:00
d449ba104a
Fix comment in the cmake file from SSDK to SDK
2013-12-19 10:29:19 +04:00
6da7c50fb5
Make dependency from CUDA explicit to prevent from fake dependedcies from CUDA runtime.
2013-12-19 10:27:38 +04:00
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
2013-12-13 17:25:16 +04:00
cc69d4631a
cmake: detect Direct 3D 11
2013-12-13 15:57:31 +04:00
f3ba1a361e
Merge pull request #1930 from alalek:cmake_msvs_subfolders
2013-12-09 16:21:16 +04:00
a54ef70c04
minor insignificant corrections
2013-12-07 18:58:28 +04:00
0e88733b13
updating Viz cmake (switched to WITH_VTK option)
2013-12-07 18:58:27 +04:00
0eb2be762a
cmake: allow source_group to preserve file-system tree (for MSVS)
2013-12-07 14:38:59 +04:00
8a48802dec
Enable GStreamer 1.x support by default.
...
GStreamer 1.x is universally available, and with 0.10 being deprecated,
there should be no reason to default to 0.10 stil.
2013-12-06 10:20:29 +01:00
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
d39e73365c
Some debug options are removed because they are installed by Cmake automatically.
...
Also forcing -ggdb3 on android leads to debuging issues.
2013-11-29 15:34:50 +04:00
5ac8444c22
fixed CUDA_TOOLKIT_TARGET_DIR for android:
...
use targets/armv7-linux-androideabi is exists
2013-11-28 13:35:23 +04:00
81acc5e73e
added -Xptxas;-dlcm=ca and -target-os-variant=Android to nvcc flags
2013-11-28 10:00:55 +04:00
Ilya Lavrenov
Roman Donchenko
Alexander Smorkalov
Vincent Rabaud
Anatoly Baksheev
GregoryMorse
Vladimir Bystricky
Alexander Alekhin
Dirk Van Haerenborgh
Vladislav Vinogradov