Andrey Pavlenko
108bb811c5
fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one)
2013-04-29 23:10:03 +04:00
Roman Donchenko
bd6f80faf3
Redo the Sphinx check to do the same thing on all platforms.
...
This also fixes the bug where the Sphinx version gets detected as
"Sphinx vX.Y.Z" instead of "X.Y.Z" on Unix-like systems.
2013-04-17 12:33:11 +04:00
Vadim Pisarevsky
3d39087a67
Merge pull request #806 from bitwangyaoyao:2.4_fix
2013-04-12 13:46:33 +04:00
yao
61e041673e
remove the OpenCL Dir finding in CMake
2013-04-12 14:44:55 +08:00
Roman Donchenko
e8721f1f6f
Automatically add CUDA support to a module if it has CUDA sources.
...
Backport from master.
2013-04-10 12:20:54 +04:00
Andrey Kamaev
d3083ecf6d
Fix bitness detection for target platform
2013-04-08 11:25:36 +04:00
Andrey Kamaev
c34820b53a
Merge pull request #766 from taka-no-me:try_compile_fix
2013-04-04 18:00:23 +04:00
Andrey Kamaev
7c402d1e15
Merge pull request #759 from asmorkalov:android_common_fixes
2013-04-04 17:58:44 +04:00
Andrey Kamaev
e7885bb8e4
Merge pull request #758 from taka-no-me:do_not_use_opengl_without_ui
2013-04-04 17:57:38 +04:00
Andrey Kamaev
fa64f28c6b
Fix binary directory used in CMake try_compile commands
...
Old paths can have problems with cross-compilation
2013-04-04 15:43:49 +04:00
Alexander Smorkalov
36367ec027
Several fixes android related fixes
...
Native activity build warning fixed;
Logcat messages for JavaCameraView updated (Bug #2876 );
Some fixes for feature #2893 done.
2013-04-04 12:18:13 +04:00
Andrey Kamaev
2c57445ffe
Improve CMake checks for the OpenGL availability
...
Issue #2868
2013-04-04 11:57:00 +04:00
Andrey Kamaev
bf3264b197
Add missed CMake include for check_include_file
...
Issue #2820
2013-04-04 11:04:51 +04:00
Andrey Kamaev
18536fe8f9
Fix target platform detection for x64 MinGW
2013-04-03 16:30:33 +04:00
Andrey Kamaev
91f6eb7cab
Merge pull request #745 from jet47:fix-gpu-warnings
2013-04-03 15:44:46 +04:00
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Alexander Smorkalov
a2561ee0cd
Code review notes fixed.
2013-04-03 04:14:40 -07:00
Vladislav Vinogradov
870563ba25
fixed compilation warning for CUDA files
...
command line option '-Wsign-promo' is valid for C++/ObjC++ but not for C [enabled by default]
2013-04-03 13:47:59 +04:00
Alexander Smorkalov
4703f4552a
Experimental MS Media Foundation API support added
2013-04-02 18:10:55 -07:00
Misty De Meo
e143706ef9
Fix ant/Java detection in cmake scripts
...
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.(cherry picked from commit a423afddc1
2013-03-29 18:29:40 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
yao
f428d1874a
discard comments in kernels.cpp
2013-03-26 12:01:01 +08:00
yao
7e495a1d66
fix amdFft and amdBlas path
2013-03-26 11:48:14 +08:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
Alexander Smorkalov
429cd85b46
More accurate guards for WinRT features in CMake.
2013-03-20 12:21:29 -07:00
Alexander Smorkalov
436d9bbcbb
Base for Native Activity example added.
2013-03-18 10:37:11 +04:00
Andrey Kamaev
08545b8f96
Merge pull request #603 from taka-no-me:avoid_deps_on_missing_lib
2013-03-01 17:10:46 +04:00
Andrey Kamaev
e6cb44edc3
Merge pull request #600 from taka-no-me:fix_build_warnings
2013-03-01 17:09:56 +04:00
Andrey Kamaev
1094179155
Avoid build falure in armeabi build with Android SDK
2013-03-01 16:50:42 +04:00
Andrey Kamaev
22d33373fa
Fix build warnings on MSVC x64 and OS X clang
2013-03-01 13:29:43 +04:00
Alexander
3cfd3d3ee0
Build with OpenCV.mk for all terget fixed.
2013-02-28 21:43:57 +04:00
Andrey Kamaev
bd38a1945d
Honor 2-digit python version
2013-02-28 16:32:13 +04:00
Andrey Kamaev
f4b413e830
Merge pull request #570 from taka-no-me:fix_android_cmakeconfig
2013-02-28 15:45:45 +04:00
Vladislav Vinogradov
61ef48eee6
fixed OpenCVConfig for cross-compilation:
...
* added CUDA to EXTRA libs if OpenCV uses it
* added -rpath-link option for linker if OpenCV was built as SHARED libs
2013-02-28 10:33:05 +04:00
Andrey Kamaev
024185b9ed
Fix OpenCVConfig.cmake generated for Android platform (issue #2496 )
...
* fix path to libraries in Android SDK
* allow to link to opencv_java.so as Android.mk does
To link to opencv_java.so you can either change your cmake to find OpenCV as
find_package(OpenCV opencv_java)
or pass -DOpenCV_FIND_COMPONENTS=opencv_java to your cmake command
2013-02-27 15:04:29 +04:00
marina.kolpakova
7a08bbbcc7
add CUDA_GENERATION macro
2013-02-26 20:13:47 +04:00
Alexander Smorkalov
3c7bc6a51e
Static ANdroid samples build for MIPS fixed
2013-02-26 10:32:10 +04:00
Alexander Smorkalov
4bbdfbc9e7
Bug #2821 Installation of OpenCV modules breaks build on MIPS Android fixed.
...
Native camera libs for MIPS installation fixed.
2013-02-22 11:57:42 +04:00
yao
f816e10ac9
Add auto detection to Intel OCL
2013-02-21 16:11:18 +08:00
Vladislav Vinogradov
78c924baad
removed obsolete CARMA toolchain and CMake variable
2013-02-14 16:27:17 +04:00
Andrey Kamaev
c7df17e77b
Detect and report parallel framework used
2013-02-13 15:09:30 +04:00
Andrey Kamaev
247df9f3fc
Detect version of clang compiler
2013-02-13 14:11:56 +04:00
Alexander Smorkalov
7882aba7af
TBB download and build option enabled for non Android platfroms.
2013-02-06 14:43:57 +04:00
Alexander Smorkalov
e58f4e44c8
Modules redifinition in case of multiple includes of OpenCV.mk in single Android.mk fixed.
2013-02-04 12:22:22 +04:00
Ivan Korolev
26c7e7f292
fix default include dirs for TBB
2013-01-30 17:17:04 +04:00
Andrey Kamaev
86b4b30a6d
Merge pull request #358 from taka-no-me:objc_exceptions
2013-01-30 14:40:32 +04:00
Andrey Kamaev
c78cb21999
Merge pull request #346 from taka-no-me:decouple_V4L2
2013-01-29 19:25:30 +04:00
Andrey Kamaev
0b1fe53a46
Add -fobjc-exceptions flag to ObjectiveC sources if supported (bug #2657 )
2013-01-29 17:09:23 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andrey Kamaev
cf407c2ec0
Don't check for EINTR and replace xioctl with ioctl
...
This should be safe todo unless we are writing a signal handler.
2013-01-28 17:58:57 +04:00
Patrick Welche
1a84bcc565
NetBSD video(4) support, patch 3 of 3
...
xioctl() assumes that ioctl takes int request. Cope with
int ioctl(int d, unsigned long request, ...)
to avoid "invalid argument".
2013-01-28 17:11:44 +04:00
Patrick Welche
d90b8d615c
NetBSD video(4) support, patch 1 of 3
...
The video(4) driver provides a Video4Linux2 compatible API for
various video peripherals. This patch propagates HAVE_VIDEOIO if
the sys/videoio.h include file is found, which is the signature of
video(4).
2013-01-28 17:11:36 +04:00
Andrey Kamaev
b445f4b01d
Find OpenCL in AMD APP SDK
2013-01-25 14:15:26 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Andrey Kamaev
0773ab4d07
Merge pull request #315 from taka-no-me:java_on
2013-01-23 19:02:27 +04:00
Andrey Kamaev
3889b34ec3
Add option to run java tests with run.py
2013-01-23 18:08:08 +04:00
Andrey Kamaev
311d799344
Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
2013-01-23 14:50:29 +04:00
yao
02c9e0a3e0
add default clAmdFft and clAmdBlas path
2013-01-23 14:48:04 +04:00
Andrey Kamaev
46c4390a2e
Hardly refactored CMake script for Java wrappers
2013-01-22 17:59:01 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
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
2013-01-14 18:58:24 +04:00
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
2013-01-10 19:05:39 +04:00
Andrey Kamaev
b6efec5f8b
Add support for Android NDK r8d
2012-12-21 15:39:23 +04:00
Andrey Kamaev
aaf779a3a2
Adjust OpenCV version to 2.4.3.2
2012-12-20 17:19:34 +04:00
Justin Muncaster
709a1cc083
Fixed typo in OpenCVDetectOpenCL.cmake that resulted in cmake not finding OpenCL on windows.
2012-12-06 13:17:25 -08:00
Andrey Kamaev
49c35fafc0
Adjust OpenCV version to 2.4.3.1
2012-11-30 14:33:28 +04:00
Alexander Smorkalov
383e04d9e4
OpenCV Manager build via ninja (Bug #2575 ) fixed.
2012-11-27 17:30:05 +04:00
marina.kolpakova
fceb62386d
fix for 2504: WITH_CUDA disabled with OSX in 2.4.3.
2012-11-23 23:11:44 +04:00
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Alexander Smorkalov
1f1d43fc88
Issue #2548 Missing static library libtbb.a for armeabi and mips build fixed.
2012-11-19 12:58:17 +04:00
Andrey Kamaev
6f08d03322
Advance version number to 2.4.3-rc
2012-10-23 17:59:59 +04:00
Andrey Kamaev
ed00642600
Force build with -O2 instead of -O3 on 32-bit linux
2012-10-23 15:52:11 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Niko
5df77a841e
remove redundant OPENCL_DIR flag
...
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
Andrey Kamaev
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
Anatoly Baksheev
f9ac5e2404
minor
2012-10-12 23:03:31 +04:00
Evgeny Talanin
2e7656dbdf
#2192 patch apply
2012-10-12 13:03:43 +04:00
Vladislav Vinogradov
8abcad6b00
fixed CUDA_FAST_MATH flag
2012-10-12 12:49:10 +04:00
Anatoly Baksheev
1d68850cb2
Added CUDA fast math flag
2012-10-10 22:16:51 +04:00
Vadim Pisarevsky
e80cbbb101
fixed C= detection script
2012-10-10 16:15:27 +04:00
Vadim Pisarevsky
e625d86485
added C= support; modified threading logic in threshold
2012-10-10 15:36:32 +04:00
Andrey Kamaev
95b6a103b5
Add sanity checks support for vertor<KeyPoint>
2012-10-09 18:41:26 +04:00
Vadim Pisarevsky
a63669f819
fixed linking CLP in the case of MinGW (patch #1872 )
2012-10-08 22:24:38 +04:00
Vadim Pisarevsky
ca6f2f080f
hopefully, correctly applied modified patch #2034 that handles Windows case
2012-10-08 22:18:13 +04:00
Vadim Pisarevsky
0bfa58b68d
fixed detection of IPP 7.1 (patch #2413 : thanks to Gino van den Bergen!)
2012-10-08 22:00:25 +04:00
Vadim Pisarevsky
4be7619ce4
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
2012-10-08 21:37:15 +04:00
cuda_geek
6b19c76233
fix hardcoded paths for static build OpenCV with CUDA
2012-10-08 10:52:58 +04:00
Anatoly Baksheev
dffba48517
Added host compiler check before CUDA detection. For not supported compilers CUDA will be disabled.
2012-09-24 16:56:19 +04:00
Andrey Kamaev
f32eb05ea1
Fix AVX and other SIMD support detection
2012-09-17 13:30:28 +04:00
Andrey Kamaev
ece71d6a06
Remove misused REQUIRED keyword from CMake scripts
2012-09-17 13:21:20 +04:00
Vadim Pisarevsky
f53d94c645
fixed OpenCL detection in Linux (patch #2261 )
2012-09-11 14:32:31 +04:00
Andrey Kamaev
200a81746e
Improve Eigen search
...
Should now automatically detect it during Android build
2012-09-10 18:15:29 +04:00
Andrey Kamaev
b8767f5fbe
Disable TBB on Android for mips
2012-09-06 18:54:38 +04:00
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
