generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,327 Commits 3 Branches 47 Tags
Commit Graph

1089 Commits

Author SHA1 Message Date
Alexander Nitsch
dde7c22fad Fix MinGW architecture detection 
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
 2015-03-07 15:37:21 +01:00
Vadim Pisarevsky
643bbb2d93 looks like Maksim was right; the new fix does not do the second attempt to detect python libs, it finds it correctly with the first attempt 2015-03-06 16:57:38 +03:00
Vadim Pisarevsky
4aa6d10a60 added Maksim's fix as well; they both handle correctly more cases than each of them individually 2015-03-06 15:48:36 +03:00
Vadim Pisarevsky
5d8a1bf813 explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only 2015-03-06 15:02:22 +03:00
Vadim Pisarevsky
7a52c3d9f1 1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there. 
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
 2015-03-05 18:58:54 +03:00
Vadim Pisarevsky
6820292256 Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib 2015-03-03 12:52:03 +00:00
Maxim Kostin
22a30af353 Fixing buildbot job: 
- explicitly turning OCL off since WinRT does not support it
 - fixing macro definitions in core/ocl.cpp

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-03-02 22:26:45 +03:00
Maxim Kostin
cdd23440c9 Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1 
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4 Python support 2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e Modified java wrapping mechanism 2015-03-02 18:12:30 +03:00
Vadim Pisarevsky
b595812bd0 Merge pull request #3745 from nitsch:fix-mingw-detection 2015-03-02 10:55:00 +00:00
Vadim Pisarevsky
8e37a693e5 Merge pull request #3758 from ilya-lavrenov:aarch64 2015-03-02 10:50:31 +00:00
Vadim Pisarevsky
0a5df01626 Merge pull request #3763 from laomaiweng:patch-1 2015-03-02 10:35:40 +00:00
Quentin Minster
98d7e52b0a Update OpenCVDetectCUDA.cmake 
Add check for CUDA version >= 7.0 (currently in RC1), which drops support for arches 1.x.
 2015-02-27 00:41:31 +01:00
Ilya Lavrenov
c5a80193a8 aarch64 support 2015-02-26 19:43:32 +03:00
Maksim Shabunin
eb30799aed Disable object libraries building for cmake 2.8.7 and earlier 2015-02-25 15:00:44 +03:00
Alexander Nitsch
a5b293b412 Fix setting of architecture for MinGW builds 
The architecture has been correctly determined earlier in this
file. No need to do it again.
 2015-02-24 23:13:27 +01:00
Alexander Smorkalov
96d7bcc2a9 Merge pull request #3677 from ilya-lavrenov:cuda_backport 2015-02-24 15:06:15 +00:00
Ilya Lavrenov
e03136e951 backport from master 2015-02-24 16:05:21 +03:00
Alexander Smorkalov
1c6e9fdfae Merge pull request #3735 from SpecLad:align-cpack-variables 2015-02-24 11:42:40 +00:00
Alexander Nitsch
8ae6402799 Fix MinGW detection on x86 
MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.

Since we are actually interested in finding the "64" in the
triplet's operating system key, this fix makes sure to look for
"mingw64" and thus avoids the false match.

Fixes issue #3835. Credits to Lode Leroy for the original patch.
 2015-02-23 15:03:28 +01:00
Ilya Lavrenov
58b3869730 fixed cross-compilation 2015-02-22 13:20:37 +03:00
Ilya Lavrenov
0832b47d21 fixed cross-compilation for Android with CUDA 2015-02-22 13:18:57 +03:00
Alexander Smorkalov
dcc569ee5c Merge pull request #3721 from nitsch:fix-cmake-current-list-dir 2015-02-21 16:49:36 +00:00
Alexander Nitsch
c2944dbc0c Exclude >= 2.8.3 from reimplementation of CMAKE_CURRENT_LIST_DIR 
This avoids violation of possible future CMake policy checks
regarding reserved/read-only variables.
 2015-02-20 19:55:46 +01:00
Roman Donchenko
cf54e3b97e Mark the libs component required 
Everything else depends on it, after all.
 2015-02-20 18:37:21 +03:00
Roman Donchenko
6d52ea8984 Add component display names 2015-02-20 18:22:01 +03:00
Roman Donchenko
b8c60234c3 Update the CPack variables to match the changes in asmorkalov/CMake#1 
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.
 2015-02-20 18:21:47 +03:00
Roman Donchenko
c1e3ca170e Add a script to run all tests on Windows 
It's pretty much a simplified copy of the Linux script, lacking fancy colors.
Also, I had to drop Python testing, because it's not easy to pass the Python
module location to the script, and I have no pressing need to run the Python
tests at the moment.
 2015-02-20 12:38:25 +03:00
Alexander Nitsch
9665e08bac Implement CMAKE_CURRENT_LIST_DIR for older CMake 
The use of built-in CMAKE_CURRENT_LIST_DIR requires at least
CMake 2.8.3. This fix properly defines the variable to allow its
use in versions < 2.8.3 as well.

Fixes issue #4205.
 2015-02-20 00:55:26 +01:00
Vadim Pisarevsky
a649aea82a Merge pull request #3699 from SpecLad:rm-component-install 2015-02-18 13:55:07 +00:00
Vadim Pisarevsky
6b371865af Merge pull request #3716 from mshabunin:fix-vs-solution-build 2015-02-18 13:48:18 +00:00
Vadim Pisarevsky
4fcfcfd002 Merge pull request #3663 from eliteraspberries:ffmpeg-dylib 2015-02-18 12:50:10 +00:00
Maksim Shabunin
2085251df2 Exclude object libraries from visual studio solution build 2015-02-18 14:16:54 +03:00
Maksim Shabunin
c41db69f98 Fixed cmake issues 2015-02-18 12:44:48 +03:00
Maksim Shabunin
553020c448 Enabled STL usage within the library 2015-02-18 12:36:50 +03:00
Roman Donchenko
49fe496914 Remove useless CPACK_*_COMPONENT_INSTALL variables 
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
 2015-02-13 15:31:19 +03:00
Roman Donchenko
0387f8ad56 Don't use ${CMAKE_INSTALL_PREFIX} as an install destination 
Absolute destinations are not necessary, and prevent CPack from working.
 2015-02-10 19:43:29 +03:00
Maksim Shabunin
a5a510da4b Support for compound modules, support for contrib_world 2015-02-10 18:30:05 +03:00
Vladislav Vinogradov
6a3f33090d make color output in run_test script optional 2015-02-09 15:24:46 +03:00
Vladislav Vinogradov
682fdcfc9b make color output in run_test script optional 2015-02-09 15:23:34 +03:00
Vladislav Vinogradov
098389d8eb fix opencv_run_all_tests_unix.sh script: 
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
 2015-02-06 12:36:18 +03:00
Vladislav Vinogradov
94d14c637f fix opencv_run_all_tests_unix.sh script: 
use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt
 2015-02-06 12:34:50 +03:00
Vadim Pisarevsky
98f9a013d1 Merge pull request #3674 from jet47:colorize-run-test-script-2.4 2015-02-05 07:35:01 +00:00
Mansour Moufid
c60fa84027 Add back the version variables removed in ab40630f. 2015-02-04 10:55:38 -05:00
Alexander Smorkalov
a87ccb9ac0 Added Debian changelog to -tests package. 2015-02-04 16:52:39 +03:00
Vladislav Vinogradov
a9325102a2 colorize opencv_run_all_tests_unix.sh script output 2015-02-04 12:39:51 +03:00
Vladislav Vinogradov
2b303f38a8 colorize opencv_run_all_tests_unix.sh script output 2015-02-04 12:38:51 +03:00
Alexander Smorkalov
e6ac64008b Debian package names replaced by lower case version to satisfy lintian. 2015-02-04 11:56:29 +03:00
Mansour Moufid
8c68f1f626 Fix indentation of 98a157f5. 2015-02-03 23:17:43 -05:00