Aaron Simmons
55a9fdf051
brining over fix in master ( #4140 ) for libz import on 64-bit android
9 years ago
Maksim Shabunin
83b2621de4
Android: renamed default library name for static and dynamic fallback load; fixed libz import for 64-bit platforms
10 years ago
Marvin Smith
ae933db526
Fixing the gdal include error that Macports seems to only mess up.
10 years ago
Marvin Smith
14548227ca
Adding support for GDAL raster images.
11 years ago
Alexander Shishkov
396f6bb55f
fixed problems with building iOS version
11 years ago
Roman Donchenko
9c01a96b14
Set minimal zlib version to 1.2.3.
...
Rationale: 1.2.3 was a security update, and we should avoid using
versions with known security vulnerabilities.
11 years ago
Roman Donchenko
6fed0e85c2
Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.
...
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
11 years ago
Roman Donchenko
e57407849a
Removed obsolete CMake workaround.
12 years ago
Roman Donchenko
e2ef2a5781
Refactored image format library finding logic.
...
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
12 years ago
Roman Donchenko
ca8b621b4f
Refactored detecting several Apple-related technologies.
...
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.
This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
12 years ago
Andrey Kamaev
bf3264b197
Add missed CMake include for check_include_file
...
Issue #2820
12 years ago
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
12 years ago
AoD314
63d9ee9523
This code is based on https://github.com/prasannatsm/opencv code.
...
- added webp (lossy and lossless without alpha channel)
- added tests
12 years ago
Andrey Kamaev
867777f825
Added OpenEXR library v1.7.1
12 years ago
Marina Kolpakova
fb3d6ecb98
merged documentation and android service from trunk
13 years ago
Andrey Kamaev
c474e27c1d
One more fix for zlib search #1902
13 years ago
Marina Kolpakova
162f9fd7ea
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
13 years ago
Andrey Kamaev
4a0249f865
Minor update for zlib search
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
Andrey Kamaev
052d2dc23a
Merged the trunk r8459:8466 (inclusive)
13 years ago
Andrey Kamaev
ca6d2fe76b
Moved 3rd-party libraries detection to separate cmake files
13 years ago
Andrey Kamaev
ba238562c6
Fix for #1902 is merged from trunk
13 years ago
Andrey Kamaev
31723effe7
#1902 added workaround for CMake 2.8.2 bug
13 years ago
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
13 years ago
Andrey Kamaev
247e2d085f
Updated for cmake 2.8.8
13 years ago
Andrey Kamaev
44098b2fbb
#1813 fixed compiler options with profiling enabled
13 years ago
Andrey Kamaev
00de4b9314
Fixed compiler flags caching in toolchain; fixed zlib search.
13 years ago
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
13 years ago
Andrey Kamaev
c208b58e6b
Fixing TBB search and zlib version detection
13 years ago
Andrey Kamaev
d1a8f562b9
Added version detection for zlib, libjpeg, libjasper, libpng, libtiff
13 years ago
Andrey Kamaev
ab221fb3d6
More accurate cmake flags sets/unsets for 3rdparty libs
13 years ago
Alexander Shishkov
06a6c5851c
updated libpng: from 1.4.3 to 1.5.9 #1609
13 years ago
Andrey Kamaev
0db570b1ca
minor cmake update
13 years ago
Andrey Kamaev
e8afcdba0a
More flexible tiff library configuration
13 years ago
Andrey Kamaev
cb9823704c
#1568 support of building with OpenEXR on Windows
13 years ago
Andrey Kamaev
8141a5026c
Refactored cmake for 3rdparty libs
13 years ago