From f3e1beca58be86d00f040a76b2bcc842e0104b4c Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bmiklautz@thinstuff.at>
Date: Thu, 28 Feb 2013 11:13:43 +0100
Subject: [PATCH] IPP: disable on arm and apple

---
 CMakeLists.txt            | 9 +++++++--
 cmake/ConfigOptions.cmake | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f9d6697c..ecdba4d37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -303,6 +303,7 @@ if(ANDROID)
 	set(GSTREAMER_FEATURE_TYPE "DISABLED")
 endif()
 
+
 find_feature(X11 ${X11_FEATURE_TYPE} ${X11_FEATURE_PURPOSE} ${X11_FEATURE_DESCRIPTION})
 find_feature(DirectFB ${DIRECTFB_FEATURE_TYPE} ${DIRECTFB_FEATURE_PURPOSE} ${DIRECTFB_FEATURE_DESCRIPTION})
 
@@ -318,8 +319,12 @@ find_feature(PCSC ${PCSC_FEATURE_TYPE} ${PCSC_FEATURE_PURPOSE} ${PCSC_FEATURE_DE
 find_feature(FFmpeg ${FFMPEG_FEATURE_TYPE} ${FFMPEG_FEATURE_PURPOSE} ${FFMPEG_FEATURE_DESCRIPTION})
 find_feature(Gstreamer ${GSTREAMER_FEATURE_TYPE} ${GSTREAMER_FEATURE_PURPOSE} ${GSTREAMER_FEATURE_DESCRIPTION})
 
-# Intel Performance Primitives
-find_feature(IPP ${IPP_FEATURE_TYPE} ${IPP_FEATURE_PURPOSE} ${IPP_FEATURE_DESCRIPTION})
+if(TARGET_ARCH MATCHES "x86|x64")
+	if (NOT APPLE)
+		# Intel Performance Primitives
+		find_feature(IPP ${IPP_FEATURE_TYPE} ${IPP_FEATURE_PURPOSE} ${IPP_FEATURE_DESCRIPTION})
+	endif()
+endif()
 
 # Installation Paths
 if(WIN32)
diff --git a/cmake/ConfigOptions.cmake b/cmake/ConfigOptions.cmake
index c922d2f78..0408e79f2 100644
--- a/cmake/ConfigOptions.cmake
+++ b/cmake/ConfigOptions.cmake
@@ -9,7 +9,6 @@ endif()
 
 option(WITH_MANPAGES "Generate manpages." ON)
 option(WITH_PROFILER "Compile profiler." OFF)
-option(WITH_IPP "Use Intel Performance Primitives." OFF)
 
 if((TARGET_ARCH MATCHES "x86|x64") AND (NOT DEFINED WITH_SSE2))
 	option(WITH_SSE2 "Enable SSE2 optimization." ON)
@@ -29,8 +28,11 @@ if(TARGET_ARCH MATCHES "ARM")
 		set(ARM_FP_ABI ${ARM_FP_API} CACHE STRING "Floating point ABI to use on arm")
 	endif()
 	mark_as_advanced(ARM_FP_ABI)
+else()
+	if(NOT APPLE)
+		option(WITH_IPP "Use Intel Performance Primitives." OFF)
+	endif()
 endif()
-
 option(WITH_JPEG "Use JPEG decoding." OFF)
 
 if(APPLE)