Changeset 4adf48e in sasview

Timestamp:

Mar 13, 2016 6:15:19 PM (9 years ago)

Author:

ajj

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:

12e19bd

Parents:

db46d13

Message:

Updating setup.py to allow builds to work on OS X 10.10 and 10.11

File:

• setup.py (modified) (1 diff)

setup.py

@@ -96 +96 @@
     try:
         darwin_ver = int(os.uname()[2].split('.')[0])
-        if darwin_ver >= 13:
+        if darwin_ver >= 13 and darwin_ver < 14:
             platform_copt = {'unix' : ['-Wno-error=unused-command-line-argument-hard-error-in-future']}
     except: