Changes in / [b52f47f:b9d9e95] in sasview

Files:

• .gitignore (added)
• setup.py (modified) (3 diffs)

setup.py

@@ -68 +68 @@
     is_64bits = sys.maxsize > 2**32
     
-enable_openmp = False if "--disable-open-mp" in sys.argv else True
+enable_openmp = True
 
 if sys.platform =='darwin':
@@ -104 +104 @@
         print "PROBLEM determining Darwin version"
 
-
+class DisableOpenMPCommand(Command):
+    description = "The version of MinGW that comes with Anaconda does not come with OpenMP :( "\
+                  "This commands means we can turn off compiling with OpenMP for this or any "\
+                  "other reason."
+    user_options = []
+
+    def initialize_options(self):
+        self.cwd = None
+
+    def finalize_options(self):
+        self.cwd = os.getcwd()
+        global enable_openmp
+        enable_openmp = False
+
+    def run(self):
+        pass
 
 class build_ext_subclass( build_ext ):
@@ -386 +401 @@
                     },
     cmdclass = {'build_ext': build_ext_subclass,
-                'docs': BuildSphinxCommand}
+                'docs': BuildSphinxCommand,
+                'disable_openmp': DisableOpenMPCommand}
     )