Andrey Pavlenko
186f8b7417
possibility to maintain custom hardware-specific libs folders
2012-09-06 16:03:07 +04:00
Andrey Kamaev
8325a28d09
Merge branch 'android-toolchain'
2012-09-04 17:10:52 +04:00
Andrey Kamaev
02b33792cb
Fix precompiled headers support detection for gcc-4.6 toolchain from Android NDK r8b
...
The version reported by toolchain is 4.6.x-google so regex needs an adjustment.
2012-09-04 16:50:55 +04:00
Andrey Kamaev
af415085d8
Fix Android build with CMake 2.6.3-2.8.3
2012-09-04 16:21:44 +04:00
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
2012-09-02 20:44:04 +04:00
Andrey Kamaev
3fb3851c7a
Remove debug print
2012-09-01 08:42:07 +04:00
Andrey Kamaev
bd12f636c8
Unify manifest files in Android examples
2012-08-31 17:47:12 +04:00
Sergiu Dotenco
85eae7b30d
win32: always link to vfw32
2012-08-30 14:52:39 +02:00
niko
b929012583
performance fix of convertC3C4
...
add OCL 1.2 feature for setTo
bug fix of integral
replace the error code -217 with suitable MACRO
simplify tests, no need apply a new context for each test case
add more control for tests in utility.hpp
2012-08-30 16:14:35 +08:00
Anatoly Baksheev
0ba01afd83
added GPU bilateral filter + tests
...
added GPU non local means brute force filter + tests
2012-08-29 19:20:32 +04:00
Leonid Beynenson
8dcf52c90b
Added possibility to make subfolders in modules' folders "src/".
2012-08-28 17:44:33 +04:00
Andrey Kamaev
bcf8dd510f
Added CCache support to Android build
...
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:
export NDK_CCACHE=ccache
2012-08-27 18:22:00 +04:00
Anatoly Baksheev
e60a50c43c
removed /EHa flag for cuda compilation
2012-08-23 16:53:53 +04:00
Anatoly Baksheev
290030d030
possibility to enable /mp compiler flag from cmake
...
fixed MCVC warnings
2012-08-23 16:53:53 +04:00
Anatoly Baksheev
d395bf1522
minor fix in FindTBB
...
added texture_binder
2012-08-23 13:37:27 +04:00
marina.kolpakova
ee0dd4d496
disabled -Wunused-but-set-variable because of multiple warnings during building nvcc auto generated files (GCC 4.6)
2012-08-20 23:35:59 +04:00
Andrey Kamaev
682dede87e
#2215 Fix dependencies escaping in generated OpenCVConfig.cmake
2012-08-20 19:53:03 +04:00
Vladislav Vinogradov
a0aef244d6
removed perf_gpu_cpu from CMake scripts
2012-08-20 09:58:37 +04:00
Alexander Smorkalov
14fa645026
Debug build for Android added. Stripping of debug build turned off.
2012-08-14 12:03:05 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
yao
c03ac12fcd
Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries
2012-08-07 16:33:46 +08:00
Vadim Pisarevsky
fac3d9994c
integrated another portion of SSE optimizations from Grigory Frolov
2012-07-31 19:07:55 +04:00
niko
cf04fed369
fix the compilation bugs
2012-07-30 14:34:36 +08:00
marina.kolpakova
22673c161a
fixed 2212
2012-07-28 13:05:40 +04:00
Niko Li
5dc7752d54
fix a bug of detect opencl
2012-07-17 06:49:32 +00:00
Vadim Pisarevsky
9f4efab40a
merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)
2012-07-16 17:08:14 +00:00
Andrey Kamaev
c474e27c1d
One more fix for zlib search #1902
2012-07-09 19:16:38 +00:00
Andrey Kamaev
a4ec89fb2c
Merged version references fix
2012-07-02 15:41:14 +00:00
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
2012-07-02 13:15:16 +00:00
Andrey Kamaev
afe11f69fb
Fixed Windows build warnings and configuration problem.
2012-06-30 20:45:01 +00:00
Andrey Kamaev
739da31add
Fixed Android build with SDK tools revision 20
2012-06-28 11:06:31 +00:00
Andrey Kamaev
15e50420bc
Fixed linux and android install
2012-06-27 13:52:29 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Andrey Kamaev
55567582a6
added XIMEA support for linux (by Igor Kuzmin) #2085
2012-06-26 11:48:58 +00:00
Andrey Kamaev
a142a3b78a
Fixed Android Manager build
2012-06-26 08:48:45 +00:00
Andrey Kamaev
4a0249f865
Minor update for zlib search
2012-06-25 16:03:45 +00:00
Andrey Kamaev
cfa9aa9206
Search python libs exactly matching to python executable on cmake 2.8.9 and newer
2012-06-24 18:25:01 +00:00
Marina Kolpakova
1365e28a54
initial support of GPU LBP classifier: added new style xml format loading
2012-06-22 15:00:36 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Marina Kolpakova
e7f6c4b7ef
scan operations are moved in separate header
2012-06-20 05:41:16 +00:00
Andrey Kamaev
8748cbc232
Fixed optional dependencies tracking in CMake. Fixed TBB compiler definitions for Android.
2012-06-19 20:08:15 +00:00
Evgeny Talanin
528da9184c
added OpenCVConfig.cmake
2012-06-19 11:28:07 +00:00
Andrey Kamaev
0f01d8df1c
Fixed Visual Studio precompiled headers
2012-06-18 09:19:57 +00:00
Andrey Kamaev
a20837fb7c
Fixed precompiled headers support detection
2012-06-18 06:53:13 +00:00
Andrey Kamaev
7cccc93bdf
Fixed Android build warnings and few warnings in specific cnfigurations
2012-06-13 13:19:43 +00:00
Andrey Kamaev
cd19de45d3
Fixed problem with incorrect detection of some compiler flags
2012-06-13 11:40:05 +00:00
Andrey Kamaev
16b50fcec7
restored -Wno-unnamed-type-template-args
2012-06-12 16:15:14 +00:00
Andrey Kamaev
4ddcf06404
Added own CMake macro for compiler flag checks (to not depend on CMake version)
2012-06-12 16:11:30 +00:00
Andrey Kamaev
37212f5e00
Fixing compiler flags checks.
2012-06-12 15:14:28 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
ffa44fb114
Fixed precompiled headers build on Linux
2012-06-08 16:04:14 +00:00
Andrey Kamaev
8720b27d87
Fixed build with TBB for Android
2012-06-08 10:32:51 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
79df8db76f
Fixed recently introduced build problems on some platforms
2012-06-08 06:19:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Andrey Kamaev
ca6d2fe76b
Moved 3rd-party libraries detection to separate cmake files
2012-05-25 13:12:02 +00:00
Andrey Kamaev
0fe0a88108
Minor cmake change
2012-05-23 19:28:41 +00:00
Vladislav Vinogradov
1d57911646
updated gpu-vs-cpu performance tests
2012-05-22 10:29:58 +00:00
Anatoly Baksheev
4793ca8fbb
fixed precom for opencv_perf_gpu_cpu
2012-05-22 08:54:48 +00:00
Andrey Kamaev
c9027fecc0
Fixed few MinGW build problems
2012-05-20 18:45:19 +00:00
Andrey Kamaev
5a3cbadfe3
Fixing Android SDK search on OS X.
2012-05-20 08:26:20 +00:00
Andrey Kamaev
f8368ba6da
MinGW: try -mpreferred-stack-boundary instead of mstackrealign
2012-05-19 08:50:24 +00:00
Andrey Kamaev
18c52c309b
Restored -O2 for MinGW
2012-05-18 17:32:55 +00:00
Andrey Kamaev
b8804ccc17
Fixed problem with manually set PYTHON_PACKAGES_PATH #1891
2012-05-18 07:43:12 +00:00
Andrey Kamaev
4a3141accf
#1932 Fixed SSE instability on mingw32
2012-05-17 20:25:12 +00:00
Andrey Kamaev
d2da219ec0
Fixed incorrect CMake variable name
2012-05-15 07:43:00 +00:00
Andrey Kamaev
9275adff81
Applied patch for IPP linking under MinGW (thanks to Philippe FOUBERT) #1906
2012-05-14 14:56:17 +00:00
Andrey Kamaev
26fb7603c0
Fixed typo #1896
2012-05-14 14:51:13 +00:00
Andrey Kamaev
07658aeb74
Fixed replacement of -O3 with -O2 for mingw compiler #1896
2012-05-14 14:19:28 +00:00
Andrey Kamaev
78915e016c
Fixed python version issue #1903
2012-05-14 14:05:25 +00:00
Andrey Kamaev
8d135e8ea1
Shortened CMake script for opencv_world. Fixed opencv_world link with non-Visual Studio generators on Windows.
2012-05-13 09:34:33 +00:00
Vadim Pisarevsky
9bbcebd6b0
added opencv_world module that combines all the other [selected by user] OpenCV modules, except for opencv_python and opencv_gpu.
2012-05-12 13:54:26 +00:00
Andrey Kamaev
31723effe7
#1902 added workaround for CMake 2.8.2 bug
2012-05-07 14:01:36 +00:00
Anatoly Baksheev
1313d8a570
added check for CMake 2.8.3 for CUDA support
2012-05-05 09:43:18 +00:00
Anatoly Baksheev
962754141a
Added check for CUDA toolkit version ( older can't compile Kepler )
2012-05-04 10:31:40 +00:00
Anatoly Baksheev
03f122ca88
Added check for CUDA toolkit version ( older can't compile Kepler )
2012-05-04 10:20:20 +00:00
Anatoly Baksheev
c05ebdffd8
Added default compilation for Kepler
2012-05-04 09:54:48 +00:00
Marina Kolpakova
6e6271d995
Debug/Release folders fix for QTCreator build
2012-05-02 20:26:19 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Andrey Kamaev
c4af85043a
merged few missed changes from 2.4 to trunk
2012-04-15 23:19:57 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexey Spizhevoy
ae839df55d
Added WITH_CLP flag support into cmake scripts.
2012-04-11 12:34:30 +00:00
Andrey Kamaev
c648de0e08
Fixed build error in Android examples when java bindings are excluded from build.
2012-03-31 12:26:03 +00:00
Andrey Kamaev
2c2616d46f
#1508 prefer architecture-specific install directory for python bindings, when LIB_SUFFIX is used
2012-03-28 13:37:58 +00:00
Andrey Kamaev
7d51a4ab78
#1416 added option to install OpenCVConfig.cmake i arch-dependent lo
2012-03-28 10:38:50 +00:00
Andrey Kamaev
e72a23243b
Reworked build scripts for Android Java API, tests and examples
2012-03-27 16:05:52 +00:00
Alexander Shishkov
216ef24b92
fixed Debug compilation on Windows (it works for VS versions > 2005)
2012-03-26 07:33:01 +00:00
Andrey Kamaev
8991d323ea
Refactored Java wrapper build scripts.
...
Improved Android SDK search, fixed some bugs.
2012-03-25 19:57:58 +00:00
Andrey Kamaev
9b2d7e19db
Added "fat" mode for Java wrapper
2012-03-23 17:03:05 +00:00
Andrey Kamaev
305d024137
CMake status report: list unsatisfied dependencies for automatically disabled modules; fixed few problems with Windows-style paths
2012-03-16 09:16:31 +00:00
Andrey Kamaev
ddc4ed4741
Added protection from modules redefinition and globbing recursion
2012-03-15 09:20:16 +00:00
Andrey Kamaev
e4307d05f3
Made dependency of features2d and calib3d from highgui optional
2012-03-13 12:33:16 +00:00
Andrey Kamaev
628076b7da
Fixed broken headers install layout
2012-03-11 15:22:38 +00:00
Andrey Morozov
52b4536d39
fixed module name for mingw compiler under Windows
2012-03-11 07:00:22 +00:00
Andrey Kamaev
18dbe6b3e5
cmake scripts are updated to prefer includes from the OpenCV source tree
2012-03-03 15:49:23 +00:00
Anatoly Baksheev
18933c12f7
Disabled BUILD_WITH_DEBUG_INFO flag for MSCV. Now debug info is included in debug configuration
2012-03-02 14:48:35 +00:00
Andrey Kamaev
ab221fb3d6
More accurate cmake flags sets/unsets for 3rdparty libs
2012-03-02 11:36:34 +00:00
Alexander Shishkov
06a6c5851c
updated libpng: from 1.4.3 to 1.5.9 #1609
2012-03-02 11:01:10 +00:00
Andrey Kamaev
aa6c677bd8
Added opencv_tests and opencv_perf_tests targets to simplify building tests only
2012-03-02 08:48:33 +00:00
Andrey Kamaev
2f4bb580fc
Fixed some build warnings; slightly improved python search
2012-03-02 08:34:54 +00:00
Andrey Kamaev
0db570b1ca
minor cmake update
2012-03-01 10:44:19 +00:00
Andrey Kamaev
e8afcdba0a
More flexible tiff library configuration
2012-03-01 09:01:32 +00:00
Vladislav Vinogradov
2d81ecce23
fixed required CUDA version in OpenCVDetectCUDA.cmake
2012-02-29 20:24:28 +00:00
Andrey Kamaev
4b5d04f475
Fixed tbb hang in Android apps
2012-02-29 08:11:01 +00:00
Andrey Kamaev
212ceb3e24
Minor improvement for Android TBB
2012-02-27 12:49:00 +00:00
Andrey Kamaev
cb9823704c
#1568 support of building with OpenEXR on Windows
2012-02-27 06:23:14 +00:00
Andrey Kamaev
c6445e2de1
Slightly improved build of TBB for Android
2012-02-27 06:19:25 +00:00
Andrey Kamaev
22d7e6b741
Scripts for building TBB for Android
2012-02-24 18:16:05 +00:00
Andrey Kamaev
8141a5026c
Refactored cmake for 3rdparty libs
2012-02-24 13:53:22 +00:00
Andrey Kamaev
01b986ef32
Fixed try_compile for Android; Fixed samples build
2012-02-24 09:35:59 +00:00
Andrey Kamaev
aa9eeddd86
Fixed problem with backslashes in cmake status report
2012-02-23 20:05:27 +00:00
Andrey Kamaev
4ac407e76a
Small refactoring of OpenCV cmake options
2012-02-22 14:04:59 +00:00
Andrey Kamaev
b294383199
Added more default search locations for Android NDK and SDK
2012-02-20 14:50:23 +00:00
Andrey Kamaev
16fb7d231e
Fixed problem with Android native camera helper libraries
2012-02-20 12:51:15 +00:00
Andrey Kamaev
00db5a69a2
More granular build of Java API: it is now possible to build Java wrappers only for the subset of OpenCV modules
2012-02-20 11:50:43 +00:00
Alexander Shishkov
8dc28473c7
fixed #1339
2012-02-20 09:16:19 +00:00
Andrey Kamaev
504262d3d8
Fixed #1608
2012-02-19 21:56:21 +00:00
Andrey Kamaev
4f97b20ff6
Refactored OpenCVConfig.cmake generation code.
2012-02-19 21:30:13 +00:00
Andrey Kamaev
691d392312
Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.
2012-02-16 20:29:35 +00:00
Vladislav Vinogradov
6f7e3434ca
moved finding CUDA_npp_LIBRARY to OpenCVDetectCUDA.cmake
2012-02-15 06:44:20 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Andrey Kamaev
68a54e7f3c
Fixed incorrectly merged patch.
2012-02-09 20:22:36 +00:00
Leonid Beynenson
3ef5bfa185
Applied the patch, received from akamaev. Also made some changes in CMake files to fix Android camera issue.
2012-02-09 15:02:21 +00:00
Vadim Pisarevsky
a618b774f2
fixed OpenCVConfig.cmake for creating Xcode projects
2012-02-08 05:45:58 +00:00
Andrey Kamaev
23af203e00
Better variant of OpenCVConfig.cmake generation; several smaller changes in the options section and Android build scripts
2012-02-06 11:30:59 +00:00
Vladislav Vinogradov
014577b433
fixed OpenCVDetectTBB.cmake (WIN32 x86 VS library path)
2012-02-06 06:11:23 +00:00
Andrey Kamaev
eac055a27e
Fixed ticket #1580
2012-02-04 18:57:41 +00:00
Andrey Kamaev
dfb161e9c9
Fixing #1580
2012-02-03 19:18:35 +00:00
Andrey Kamaev
fdc1e87ddf
Attempt to fix #1580 - building OpenCV with ffmpeg not in LD_LIBRARY_PATH
2012-02-03 18:52:00 +00:00
Andrey Kamaev
1e79280be1
Fixed OpenCVConfig.cmake generated for build directory
2012-02-03 15:22:54 +00:00
Andrey Kamaev
c99253d62d
Fixing build on Windows
2012-02-03 12:33:48 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Alexey Spizhevoy
ada9158521
Fixed the building process for (ubuntu 64bit debug cuda4.1) configuration
2012-02-02 14:06:13 +00:00
Anatoly Baksheev
3c645ae20c
fixed CUDA compilation
2012-01-25 15:27:37 +00:00
Andrey Kamaev
c86c6a028c
Updating opencv module definition in cmake (continued)
2012-01-25 13:12:11 +00:00
Andrey Kamaev
9d5c24cdc8
Updating opencv module definition in cmake (continued)
2012-01-25 09:04:49 +00:00
Andrey Kamaev
13f4e70e95
Updating opencv module definition in cmake
2012-01-24 16:55:47 +00:00
Andrey Kamaev
7bf091cd98
Fixed modules order in OpenCV.mk.in
2012-01-09 07:43:37 +00:00
Andrey Kamaev
8cab65c173
Started top-level CMakeLists.txt file reorganization: cmake scripts are moved to separate folder; refactored BUILD_*, INSTALL_*, ENABLE_*, USE_*, WITH_* options.
2012-01-03 13:48:12 +00:00
