Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
11 years ago
Roman Donchenko
76b904b022
Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES.
...
The reasons for that are twofold:
1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023
Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022
I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)
I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
11 years ago
Alexander Alekhin
034a77c26d
cmake: workaround for dependencies resolver (bypass non-module deps w/o check)
11 years ago
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
11 years ago
Alexander Alekhin
dd9ff587dc
ocl: file-based ProgramCache refactoring
11 years ago
Alexander Alekhin
b00f79ac5f
ocl: move program names into opencl_kernels.hpp
11 years ago
Alexander Alekhin
48774a39b4
cmake: fixed incorrect usage of add_definitions() on Linux
11 years ago
Alexander Alekhin
ce557fb7be
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
...
This reverts commit 286244efed
.
11 years ago
Alexander Alekhin
286244efed
cmake: fixed incorrect usage of add_definitions() on Linux
11 years ago
Roman Donchenko
e5735282da
Added the ability to have samples inside a module.
11 years ago
Roman Donchenko
9667a8a1ae
Fix the name of perf tests' precompiled header.
...
(cherry picked from commit aa96d8d053
)
11 years ago
Roman Donchenko
6d7f29a03a
Made it so that a dummy .cpp is actually created when compiling with VC++.
11 years ago
Roman Donchenko
ee182eb086
Fixed the setting of CVAPI_EXPORTS for modules that are always static/shared.
...
Also, removed needless check of BUILD_SHARED_LIBS in core; in that case,
only the current module's library type matters.
12 years ago
Roman Donchenko
33d1f67501
Include the OpenCV config headers into every module.
...
This has no bearing on compilation, but it makes them show up in IDEs.
12 years ago
Roman Donchenko
985bfea556
Don't resolve symlinks when looking for modules.
...
We don't really need it, it makes the code longer, and it can lead to
inconsistent paths when OpenCV is itself inside a symlink.
12 years ago
Roman Donchenko
e8721f1f6f
Automatically add CUDA support to a module if it has CUDA sources.
...
Backport from master.
12 years ago
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
12 years ago
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
12 years ago
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
12 years ago
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
12 years ago
Andrey Kamaev
3cb84ed17c
Fix dependencies inference for auto-disabled targets
...
Sometimes information about dependencies causing disabling were loosed and it
was not possible to correctly display these dependencies in status report
12 years ago
Andrey Kamaev
cf8deac2b2
Always touch variable controlling build of the module
...
This suppresses "unused variable" CMake warning when user explicilty disables
module unavailable in selected configuration
12 years ago
Andrey Kamaev
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
12 years ago
Leonid Beynenson
8dcf52c90b
Added possibility to make subfolders in modules' folders "src/".
12 years ago
Vladislav Vinogradov
a0aef244d6
removed perf_gpu_cpu from CMake scripts
12 years ago
Marina Kolpakova
b28b2428f6
changing package layout after 'make install' for Android build
13 years ago
Marina Kolpakova
6cca6a4548
merged the trunk r8669:8702
13 years ago
Andrey Kamaev
15e50420bc
Fixed linux and android install
13 years ago
Andrey Kamaev
8748cbc232
Fixed optional dependencies tracking in CMake. Fixed TBB compiler definitions for Android.
13 years ago
Andrey Kamaev
a20837fb7c
Fixed precompiled headers support detection
13 years ago
Andrey Kamaev
bd0e0b5800
Merged the trunk r8589:8653 - all changes related to build warnings
13 years ago
Andrey Kamaev
79df8db76f
Fixed recently introduced build problems on some platforms
13 years ago
Vladislav Vinogradov
1d57911646
updated gpu-vs-cpu performance tests
13 years ago
Anatoly Baksheev
4793ca8fbb
fixed precom for opencv_perf_gpu_cpu
13 years ago
Andrey Kamaev
70166820ea
Merged the trunk r8324:8345
13 years ago
Andrey Kamaev
8d135e8ea1
Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.
13 years ago
Vadim Pisarevsky
9bbcebd6b0
added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu.
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Kamaev
624880fd67
Minor update for new Ninja cmake generator
13 years ago
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
13 years ago
Andrey Kamaev
7c33d65b59
Fixed broken by r8007 install target
13 years ago
Andrey Kamaev
b3587c9e34
Fixed problem with headers install patch
13 years ago
Andrey Kamaev
e72a23243b
Reworked build scripts for Android Java API, tests and examples
13 years ago
Andrey Kamaev
8991d323ea
Refactored Java wrapper build scripts.
...
Improved Android SDK search, fixed some bugs.
13 years ago
Andrey Kamaev
ddc4ed4741
Added protection from modules redefinition and globbing recursion
13 years ago
Andrey Kamaev
e4307d05f3
Made dependency of features2d and calib3d from highgui optional
13 years ago
Andrey Kamaev
628076b7da
Fixed broken headers install layout
13 years ago
Andrey Kamaev
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
13 years ago
Andrey Kamaev
aa6c677bd8
Added opencv_tests and opencv_perf_tests targets to simplify building tests only
13 years ago
Andrey Kamaev
00db5a69a2
More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules
13 years ago