Andrey Pavlenko
87fcd2342f
Merge pull request #878 from apavlenko:better_glue_search
2013-05-14 11:57:25 +04:00
Andrey Pavlenko
d94ecf40e6
Merge pull request #880 from apavlenko:qt-5.0
2013-05-13 21:18:47 +04:00
Andrey Kamaev
f856f78ac0
Update CMake scripts to recognize Qt 5.0
2013-05-13 17:10:32 +04:00
Andrey Kamaev
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
2013-05-13 17:01:18 +04:00
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
