mirror of
https://github.com/opencv/opencv.git
synced 2026-10-08 23:44:23 +03:00
Merge pull request #1335 from alekcac:ios-build-fix
This commit is contained in:
commit
7cefb6f50b
2 files changed
+7
-5
No files matched your search
@@ -114,7 +114,7 @@ if(WITH_JASPER)
|
||||
endif()
|
||||
|
||||
# --- libpng (optional, should be searched after zlib) ---
|
||||
if(WITH_PNG AND NOT IOS)
|
||||
if(WITH_PNG)
|
||||
if(BUILD_PNG)
|
||||
ocv_clear_vars(PNG_FOUND)
|
||||
else()
|
||||
|
||||
@@ -241,8 +241,10 @@ if(WITH_AVFOUNDATION)
|
||||
endif()
|
||||
|
||||
# --- QuickTime ---
|
||||
if(WITH_QUICKTIME)
|
||||
set(HAVE_QUICKTIME YES)
|
||||
elseif(APPLE)
|
||||
set(HAVE_QTKIT YES)
|
||||
if (NOT IOS)
|
||||
if(WITH_QUICKTIME)
|
||||
set(HAVE_QUICKTIME YES)
|
||||
elseif(APPLE)
|
||||
set(HAVE_QTKIT YES)
|
||||
endif()
|
||||
endif()
|
||||
Reference in new issue
Block a user