Marina Kolpakova
|
b28b2428f6
|
changing package layout after 'make install' for Android build
|
2012-06-28 17:23:50 +00:00 |
|
Marina Kolpakova
|
162f9fd7ea
|
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
|
2012-06-28 17:07:17 +00:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Andrey Kamaev
|
d1a8f562b9
|
Added version detection for zlib, libjpeg, libjasper, libpng, libtiff
|
2012-04-09 11:32:28 +00:00 |
|
Andrey Kamaev
|
7cc7a3f37d
|
Suppressed hundreds of useless MSVC warnings (can be reenabled setting cmake variable ENABLE_NOISY_WARNINGS to ON). Fixed some of remaining warnings.
|
2012-04-08 21:49:19 +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 |
|
Andrey Kamaev
|
8141a5026c
|
Refactored cmake for 3rdparty libs
|
2012-02-24 13:53:22 +00:00 |
|
Andrey Kamaev
|
a8f0c93379
|
Modified zlib search. Use system zlib on Android by default
|
2012-02-24 12:23:34 +00:00 |
|
Andrey Kamaev
|
d40721e5c0
|
Suppressed MSVC warnings in zlib
|
2012-02-22 20:22:29 +00:00 |
|
Andrey Kamaev
|
19ce8c7f12
|
#1609 zlib is updated to 1.2.6
|
2012-02-22 15:52:23 +00:00 |
|
Andrey Kamaev
|
b43ae03328
|
* Install path share/opencv is renamed to share/OpenCV.
* Fixed zlib search.
* Fixed compiler/linker flags caching bug.
* Fixed OpenCVConfig.cmake generation (currently tested only on Unix).
|
2011-06-27 13:59:03 +00:00 |
|
Andrey Kamaev
|
c1940b4ec7
|
Modified install layout for Android
|
2011-06-24 15:40:27 +00:00 |
|
Anatoly Baksheev
|
69f28ef65c
|
solution folder flag disabled by default
|
2011-05-17 09:40:06 +00:00 |
|
Anatoly Baksheev
|
c49dc37761
|
[+] added use_folders cmake feature if cmake version is greater then 2.8.0
[~] fixed warning in featuers2d under windows (can't generate assignment operator)
|
2011-05-11 13:37:20 +00:00 |
|
Vadim Pisarevsky
|
6985540744
|
moved image codecs' headers to the respective subdirectories; allow the user to use system zlib.
|
2011-04-26 15:46:15 +00:00 |
|
Andrey Kamaev
|
68534d70f3
|
Merged android-experimental branch back to trunk.
|
2011-04-06 14:31:03 +00:00 |
|
Vadim Pisarevsky
|
9dfb15dbbd
|
some more fixes for the static library configuration
|
2010-12-05 02:10:59 +00:00 |
|
Vadim Pisarevsky
|
0de9c9fd3c
|
opencv_zlib renamed back to zlib; make static libs work on Windows
|
2010-12-05 01:19:36 +00:00 |
|
Vadim Pisarevsky
|
8b4cb1d99c
|
make OpenCVConfig.cmake usable in the case of static libs
|
2010-12-04 23:02:36 +00:00 |
|
Ethan Rublee
|
a732082526
|
modding the 3rdparty CMakeLists.txt to allow for android compilation using cmake
Basically just adding lines at top of CMakeLists that alter behavior if ANDROID is set to
true.
|
2010-09-22 02:01:54 +00:00 |
|
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
2010-05-11 17:44:00 +00:00 |
|