=== modified file 'CMakeLists.txt'
--- old/CMakeLists.txt	2014-06-03 15:59:52 +0000
+++ new/CMakeLists.txt	2014-06-23 17:49:22 +0000
@@ -109,6 +109,10 @@
 #================================================
 # Set flags for GCC, or treat llvm as GCC
 #================================================
+if (APPLE)
+  set( MALLOC_IN_STDLIB_H 1 )
+  set( MACOSX_VERSION_MIN 10.7 )
+endif()
 
 if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
 
@@ -227,8 +231,8 @@
 
     if( APPLE )
 
-        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" )
+        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
+        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=${MACOSX_VERSION_MIN} -stdlib=libstdc++" )
 
         # Allows .dylib relocation in the future - needed by fixbundle
         set( CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -headerpad_max_install_names")
@@ -501,7 +505,11 @@
 # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
 
 # See line 41 of CMakeModules/FindwxWidgets.cmake
-set( wxWidgets_CONFIG_OPTIONS --static=no )
+if( KICAD_BUILD_STATIC )
+  set( wxWidgets_CONFIG_OPTIONS --static=yes )
+elseif( KICAD_BUILD_DYNAMIC )
+  set( wxWidgets_CONFIG_OPTIONS --static=no )
+endif()
 
 # On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base
 # Seems no more needed on wx-3

=== modified file 'CMakeModules/download_boost.cmake'
--- old/CMakeModules/download_boost.cmake	2014-05-01 13:55:50 +0000
+++ new/CMakeModules/download_boost.cmake	2014-06-23 17:47:28 +0000
@@ -143,8 +143,8 @@
     # I set this to being compatible with wxWidgets
     # wxWidgets still using libstdc++ (gcc), meanwhile OSX
     # has switched to libc++ (llvm) by default
-    set( BOOST_CXXFLAGS  "cxxflags=-mmacosx-version-min=10.5  -fno-common" )
-    set( BOOST_LINKFLAGS "linkflags=-mmacosx-version-min=10.5 -fno-common" )
+    set( BOOST_CXXFLAGS  "cxxflags=-mmacosx-version-min=${MACOSX_VERSION_MIN}  -fno-common" )
+    set( BOOST_LINKFLAGS "linkflags=-mmacosx-version-min=${MACOSX_VERSION_MIN} -fno-common" )
     set( BOOST_TOOLSET   "toolset=darwin" )
 
     if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )

=== modified file 'CMakeModules/download_glew.cmake'
--- old/CMakeModules/download_glew.cmake	2014-04-02 13:38:59 +0000
+++ new/CMakeModules/download_glew.cmake	2014-06-23 17:57:39 +0000
@@ -41,8 +41,8 @@
 
 if (APPLE)
     if( CMAKE_OSX_ARCHITECTURES )
-        set( GLEW_CFLAGS  "CFLAGS.EXTRA=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
-        set( GLEW_LDFLAGS "LDFLAGS.EXTRA=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
+        set( GLEW_CFLAGS  "CFLAGS.EXTRA=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
+        set( GLEW_LDFLAGS "LDFLAGS.EXTRA=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
         set( GLEW_STRIP   "STRIP=")
     endif( CMAKE_OSX_ARCHITECTURES )
 endif(APPLE)

=== modified file 'CMakeModules/download_pcre.cmake'
--- old/CMakeModules/download_pcre.cmake	2014-03-06 09:43:40 +0000
+++ new/CMakeModules/download_pcre.cmake	2014-06-23 17:52:19 +0000
@@ -37,9 +37,9 @@
 
 if (APPLE) 
     if( CMAKE_OSX_ARCHITECTURES )
-        set( PCRE_CFLAGS  "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
-        set( PCRE_CXXFLAGS "CXXFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
-        set( PCRE_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
+        set( PCRE_CFLAGS  "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
+        set( PCRE_CXXFLAGS "CXXFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
+        set( PCRE_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
     endif( CMAKE_OSX_ARCHITECTURES )
 endif(APPLE)
 

=== modified file 'CMakeModules/download_pixman.cmake'
--- old/CMakeModules/download_pixman.cmake	2014-04-02 13:38:59 +0000
+++ new/CMakeModules/download_pixman.cmake	2014-06-23 17:53:33 +0000
@@ -43,9 +43,9 @@
 
 if (APPLE)
     if( CMAKE_OSX_ARCHITECTURES )
-        set(PIXMAN_CPPFLAGS "${PIXMAN_CPPFLAGS} -arch ${CMAKE_OSX_ARCHITECTURES} -fno-common -mmacosx-version-min=10.5")
+        set(PIXMAN_CPPFLAGS "${PIXMAN_CPPFLAGS} -arch ${CMAKE_OSX_ARCHITECTURES} -fno-common -mmacosx-version-min=${MACOSX_VERSION_MIN}")
     else()
-        set(PIXMAN_CPPFLAGS "${PIXMAN_CPPFLAGS} -fno-common -mmacosx-version-min=10.5")
+        set(PIXMAN_CPPFLAGS "${PIXMAN_CPPFLAGS} -fno-common -mmacosx-version-min=${MACOSX_VERSION_MIN}")
     endif( CMAKE_OSX_ARCHITECTURES )
 endif(APPLE)
 

=== modified file 'CMakeModules/download_swig.cmake'
--- old/CMakeModules/download_swig.cmake	2014-03-06 09:43:40 +0000
+++ new/CMakeModules/download_swig.cmake	2014-06-23 17:55:00 +0000
@@ -39,9 +39,9 @@
 
 if (APPLE) 
     if( CMAKE_OSX_ARCHITECTURES )
-        set( SWIG_CFLAGS  "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
-        set( SWIG_CXXFLAGS  "CXXFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
-        set( SWIG_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
+        set( SWIG_CFLAGS  "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
+        set( SWIG_CXXFLAGS  "CXXFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
+        set( SWIG_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=${MACOSX_VERSION_MIN}" )
     endif( CMAKE_OSX_ARCHITECTURES )
 
     set( SWIG_PYTHON  "--with-python=/usr/bin/python2.6" )