[QGIS Commit] r11549 - branches/Version-1_0/python

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2009-09-04 21:16:48 -0400 (Fri, 04 Sep 2009)
New Revision: 11549

Modified:
   branches/Version-1_0/python/configure.py.in
Log:
handle more than 2 archs for OSX universal build (from trunk, fix for #1658)

Modified: branches/Version-1_0/python/configure.py.in
===================================================================
--- branches/Version-1_0/python/configure.py.in	2009-09-05 00:03:48 UTC (rev 11548)
+++ branches/Version-1_0/python/configure.py.in	2009-09-05 01:16:48 UTC (rev 11549)
@@ -17,9 +17,11 @@
 qt_libs = ["QtCore","QtGui","QtNetwork","QtSvg","QtXml"]
 if sys.platform == 'darwin':
   qt_libs.append("QtSql")
-  # possibility of universal build of bindings
+  # possibility of universal build of bindings, if more than 1 arch
   osx_archs = '@CMAKE_OSX_ARCHITECTURES@'
-  if osx_archs == 'ppc;i386' or osx_archs == 'i386;ppc':
+  if osx_archs [-1] == ';' :
+    osx_archs = osx_archs [:-1]
+  if osx_archs.count(';') > 0:
     osx_universal = '@CMAKE_OSX_SYSROOT@'
   else:
     osx_universal = ''