Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
13 years ago |
Andrey Kamaev
|
18dbe6b3e5
|
cmake scripts are updated to prefer includes from the OpenCV source tree
|
13 years ago |
Andrey Kamaev
|
8141a5026c
|
Refactored cmake for 3rdparty libs
|
13 years ago |
Andrey Kamaev
|
a8f0c93379
|
Modified zlib search. Use system zlib on Android by default
|
13 years ago |
Andrey Kamaev
|
d40721e5c0
|
Suppressed MSVC warnings in zlib
|
13 years ago |
Andrey Kamaev
|
19ce8c7f12
|
#1609 zlib is updated to 1.2.6
|
13 years ago |
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).
|
14 years ago |
Andrey Kamaev
|
c1940b4ec7
|
Modified install layout for Android
|
14 years ago |
Anatoly Baksheev
|
69f28ef65c
|
solution folder flag disabled by default
|
14 years ago |
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)
|
14 years ago |
Vadim Pisarevsky
|
6985540744
|
moved image codecs' headers to the respective subdirectories; allow the user to use system zlib.
|
14 years ago |
Andrey Kamaev
|
68534d70f3
|
Merged android-experimental branch back to trunk.
|
14 years ago |
Vadim Pisarevsky
|
9dfb15dbbd
|
some more fixes for the static library configuration
|
14 years ago |
Vadim Pisarevsky
|
0de9c9fd3c
|
opencv_zlib renamed back to zlib; make static libs work on Windows
|
14 years ago |
Vadim Pisarevsky
|
8b4cb1d99c
|
make OpenCVConfig.cmake usable in the case of static libs
|
14 years ago |
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.
|
14 years ago |
Vadim Pisarevsky
|
127d6649a1
|
"atomic bomb" commit. Reorganized OpenCV directory structure
|
15 years ago |