d81d51d155
assing labels to targets and sources
2015-10-13 17:33:26 +03:00
f52cac9d47
fix #5264
2015-09-24 15:56:47 +03:00
5eb67cc2cb
fix for corrent modules dependencies
2015-09-13 12:44:35 +02:00
1c3d83df54
fix for corrent modules dependencies
2015-09-11 11:30:10 +03:00
784f77a4a5
Merge pull request #5210 from a-stacey:cmake_3.1.0_pdb_support
2015-08-24 16:00:56 +00:00
973abf0d62
cmake: Added missing extra modules warning
2015-08-19 18:33:59 +03:00
d8d78b4a98
Fix pdb file generation on Windows for CMake versions after 3.1.0.
...
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
2015-08-17 10:28:22 +10:00
5262371660
install new headers like "opencv2/core.hpp"
2015-08-02 13:13:58 +02:00
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
6a6d58d389
Adding test support for WINRT
2015-06-30 15:35:20 +03:00
7bfd070864
Merge pull request #4095 from alalek:hal_unresolved_symbols
2015-06-17 14:35:40 +00:00
b7cfd5a7da
ocl: added errors processing in OpenCL code generator, resolve space issue
2015-06-11 15:36:29 +03:00
8184e57dd6
fix tests build (win,shared,world)
2015-06-05 16:30:36 +03:00
653810e4df
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
2015-05-24 14:06:32 +02:00
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
6e121b2e29
Use imported targets for linking to CUDA
...
This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:
* It removes the need to use link_directories, which doesn't guarantee that
the libraries from the supplied directory will be used (there may be
libraries with the same names earlier in the search path).
* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
is used with target_link_libraries, where such entries are treated as linker
flags, so doing this is unportable. I remove the support for -L entries
from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
future.
2015-03-31 13:46:28 +03:00
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
eb30799aed
Disable object libraries building for cmake 2.8.7 and earlier
2015-02-25 15:00:44 +03:00
c41db69f98
Fixed cmake issues
2015-02-18 12:44:48 +03:00
553020c448
Enabled STL usage within the library
2015-02-18 12:36:50 +03:00
a5a510da4b
Support for compound modules, support for contrib_world
2015-02-10 18:30:05 +03:00
cf852972d1
Fixed samples install permissions for Debian packaging.
2015-02-01 00:34:23 +03:00
124ac15f1e
remove cuda module
2015-01-22 15:02:21 +03:00
579ce93885
Merge pull request #3598 from caraffi:bug4108_testCasesLinkError
2015-01-20 12:59:34 +00:00
aacb9b7cf5
Merge pull request #3610 from jet47:fix-ocv_add_module-3.0
2015-01-20 12:35:36 +00:00
698c367d8d
fix ocv_add_module CMake macro:
...
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
2015-01-16 11:00:56 +03:00
12a3eb776d
fix ocv_add_module CMake macro:
...
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
2015-01-16 10:59:52 +03:00
0376a8643e
fix CMake CMP0054 warning:
...
ported from c105b72945
2015-01-15 18:40:33 +03:00
efc7dbaae2
Prevent linking failure, bug 4108
2015-01-14 11:55:41 +01:00
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
c28fea32c7
Build separate world-like iOS framework for contrib
2014-12-05 17:48:28 +03:00
4f8a1213bd
determine test category (Public vs Extra) based on module location
2014-10-21 18:51:02 +04:00
edf54ac3a9
add CTest targets for sanity tests
2014-10-21 18:50:38 +04:00
f44c29ad7d
disable CTest target for opencv_test_viz:
...
opencv_test_viz creates windows and waits until user close them,
it is not appropriate for automatic testing
2014-10-21 18:49:53 +04:00
0c57dc2e00
rewrite add_test command for accuracy tests:
...
* use new syntax introduced in CMake 2.8.0
* set OPENCV_TEST_DATA_PATH enviroment property
2014-10-21 18:48:46 +04:00
f55c1cc0fb
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
2014-10-17 13:23:23 +04:00
a218bdb0d7
fix cmake ocv_add_samples for opencv_contrib/modules/bioinspired
...
If a sample containing subdirs, a Cmake error will be raised, since the original code can only install FILES.
2014-08-20 08:36:44 -07:00
0825120f6a
move CUDA compilation step from ocv_glob_module_sources to ocv_add_library
2014-08-13 18:07:31 +04:00
55188fe991
world fix
2014-08-05 20:12:35 +04:00
de37cfc224
Enable Intel AVX/AVX2 compilation on Windows.
2014-07-21 13:26:50 -07:00
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
c38023f4e7
Modifications to support dynamic vector dispatch.
2014-07-09 16:55:39 -07:00
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +04:00
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
40a740ff88
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
2014-03-17 14:14:07 +04:00
836635d2d5
Merge pull request #2434 from Nerei:viz_continue
2014-03-12 16:53:42 +04:00
4d7a593c25
minor cmake fix fo macos
2014-03-12 16:22:22 +04:00
Vladislav Vinogradov