Changeset f468791 in sasview for setup.py

Timestamp:

Oct 24, 2013 10:40:22 AM (11 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:

1f8eecb

Parents:

a9d5684

Message:

Move plottools under sans

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -67 +67 @@
 enable_openmp = True                    
 
-if sys.platform =='darwin' and not is_64bits:
-    # Disable OpenMP
-    enable_openmp = False
+if sys.platform =='darwin':
+    if not is_64bits:
+        # Disable OpenMP
+        enable_openmp = False
+    else:
+        # Newer versions of Darwin don't support openmp
+        try:
+            darwin_ver = int(os.uname()[2].split('.')[0])
+            if darwin_ver >= 12:
+                enable_openmp = False
+        except:
+            print "PROBLEM determining Darwin version"
 
 # Options to enable OpenMP
@@ -175 +184 @@
 
 # Plottools
-package_dir["danse"] = os.path.join("src", "danse")
-package_dir["danse.common"] = os.path.join("src", "danse", "common")
-package_dir["danse.common.plottools"] = os.path.join("src", "danse", "common", "plottools")
-packages.extend(["danse", "danse.common", "danse.common.plottools"])
+package_dir["sans.plottools"] = os.path.join("src", "sans", "plottools")
+packages.append("sans.plottools")
 
 # Park 1.2.1