From a37876ab9531cf358a0c143f12f102158d6d28e6 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Wed, 13 Aug 2014 19:59:26 +0400 Subject: [PATCH 1/3] fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge --- modules/core/src/convert.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index 61499b39a..6362475d0 100644 --- a/modules/core/src/convert.cpp +++ b/modules/core/src/convert.cpp @@ -43,6 +43,10 @@ #include "precomp.hpp" #include "opencl_kernels_core.hpp" +#ifdef __APPLE__ +#undef CV_NEON +#endif + namespace cv { From 5d8098a2c3f702cfce7abbb3593a2d0a27b89b83 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 14 Aug 2014 10:06:10 +0400 Subject: [PATCH 2/3] avoid compiler warnings --- modules/core/src/convert.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index 6362475d0..fefc8ee2e 100644 --- a/modules/core/src/convert.cpp +++ b/modules/core/src/convert.cpp @@ -45,6 +45,7 @@ #ifdef __APPLE__ #undef CV_NEON +#define CV_NEON 0 #endif namespace cv From 6f86c9f118268340caf657a485d575cb3cf38b7a Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 14 Aug 2014 10:45:47 +0400 Subject: [PATCH 3/3] another mac-related fix, let's squeeze it in this PR too --- modules/python/common.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/python/common.cmake b/modules/python/common.cmake index 164515c72..7f2839ece 100644 --- a/modules/python/common.cmake +++ b/modules/python/common.cmake @@ -21,6 +21,7 @@ ocv_list_filterout(candidate_deps "^opencv_tracking$") ocv_list_filterout(candidate_deps "^opencv_optflow$") ocv_list_filterout(candidate_deps "^opencv_bgsegm$") ocv_list_filterout(candidate_deps "^opencv_xfeatures2d$") +ocv_list_filterout(candidate_deps "^opencv_ts$") ocv_add_module(${MODULE_NAME} BINDINGS OPTIONAL ${candidate_deps})