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

Merge pull request #2925 from BloodAxe:osx-framework-script

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-07-19 18:04:14 +00:00
parent a7006ac21c 92ead5fab3
commit 9a58b1a3a0
5 changed files with 148 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/world/CMakeLists.txt
View File

@@ -106,11 +106,11 @@ macro(ios_include_3party_libs)
ocv_list_filterout(objlist jmemansi) # <<= dirty fix
endmacro()
if(IOS AND WITH_PNG)
if( (IOS OR APPLE) AND WITH_PNG)
ios_include_3party_libs(zlib libpng)
endif()
if(IOS AND WITH_JPEG)
if( (IOS OR APPLE) AND WITH_JPEG)
ios_include_3party_libs(libjpeg)
endif()