generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged android-experimental branch back to trunk.

Browse Source
This commit is contained in:
Andrey Kamaev
2011-04-06 14:31:03 +00:00
parent bbdd0aecbd
commit 68534d70f3
120 changed files with 3483 additions and 1620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/zlib/CMakeLists.txt vendored
View File

@@ -1,6 +1,3 @@
if(ANDROID)
define_3rdparty_module(zlib)
else()
# ----------------------------------------------------------------------------
# CMake file for zlib. See root CMakeLists.txt
#
@@ -43,5 +40,3 @@ if(NOT BUILD_SHARED_LIBS)
install(TARGETS ${the_target}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main)
endif()
endif(ANDROID)