From 5054cac6abaf39d1abfda790cdf3844317696d46 Mon Sep 17 00:00:00 2001 From: wonder Date: Wed, 19 Dec 2007 18:21:35 +0000 Subject: [PATCH] PyQGIS: support for Mac universal builds - fixes #876 git-svn-id: http://svn.osgeo.org/qgis/trunk@7807 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/configure.py.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/python/configure.py.in b/python/configure.py.in index 89b64e7291f..9be76177ba8 100644 --- a/python/configure.py.in +++ b/python/configure.py.in @@ -16,6 +16,14 @@ qt_libs = ["QtCore","QtGui","QtNetwork","QtSvg","QtXml"] if sys.platform == 'darwin': qt_libs.append("Qt3Support") qt_libs.append("QtSql") + # possibility of universal build of bindings + osx_archs = '@CMAKE_OSX_ARCHITECTURES@' + if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc': + osx_universal = '@CMAKE_OSX_SYSROOT@' + else: + osx_universal = '' +else: + osx_universal = '' if len(sys.argv)>1: intdir = "/" + sys.argv[1] @@ -98,7 +106,8 @@ makefile_core = sipconfig.ModuleMakefile( build_file=build_file_core, installs=installs_core, install_dir=mod_dir, - dir="core") + dir="core", + universal=osx_universal) makefile_gui = sipconfig.ModuleMakefile( configuration=config, @@ -106,7 +115,8 @@ makefile_gui = sipconfig.ModuleMakefile( build_file=build_file_gui, installs=installs_gui, install_dir=mod_dir, - dir="gui") + dir="gui", + universal=osx_universal) # common settings for both core and gui libs for mk in [ makefile_core, makefile_gui ]: