From 290a60a4629124145406528364a1c78db48bfd9f Mon Sep 17 00:00:00 2001
From: Marco Serantoni <marco.serantoni@gmail.com>
Date: Tue, 7 Jan 2014 00:20:52 +0100
Subject: [PATCH] =?UTF-8?q?[MacOSX]=C2=A0Fixing=20STL=20&&=20single=20proc?=
 =?UTF-8?q?essor=20building=20in=20pixman?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                     | 4 ++--
 CMakeModules/download_pixman.cmake | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb3090d4c1..300ab23c3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,8 +170,8 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     endif()
 
     if( APPLE )
-        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -D__ASSERTMACROS__" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__ASSERTMACROS__" )
+        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=10.5" )
+        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=10.5" )
     endif()
 
 endif( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
diff --git a/CMakeModules/download_pixman.cmake b/CMakeModules/download_pixman.cmake
index 74716c8cfa..57dfb47526 100644
--- a/CMakeModules/download_pixman.cmake
+++ b/CMakeModules/download_pixman.cmake
@@ -40,6 +40,8 @@ set( PREFIX ${DOWNLOAD_DIR}/pixman )
 if (APPLE) 
     if( CMAKE_OSX_ARCHITECTURES )
         set(PIXMAN_CPPFLAGS "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -fno-common -mmacosx-version-min=10.5")
+    else()
+        set(PIXMAN_CPPFLAGS "CFLAGS=-fno-common -mmacosx-version-min=10.5")
     endif( CMAKE_OSX_ARCHITECTURES )
 endif(APPLE)