Changeset 01de557 in sasview

Timestamp:

Dec 8, 2011 2:57:11 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3176ea7

Parents:

0b082f3

Message:

Re #7 Turn off openmp for gcc4.0 on mac

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -5 +5 @@
 import sys
 import os
+import platform
 #from distutils.core import setup, Extension
 from setuptools import setup, Extension, find_packages
@@ -28 +29 @@
 extra_compile_args = []
 extra_link_args = []
-if not os.name=='nt':
+if sys.platform=='linux2' or (sys.platform=='darwin' and platform.architecture()[0]=='64bit'):
     extra_compile_args = ['-fopenmp']
     extra_link_args = ['-lgomp']
-else:
+elif os.name=='nt':
     extra_compile_args = ['/openmp']