Changeset ebdb833 in sasview

Timestamp:

Dec 28, 2011 6:04:56 PM (13 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:

e79a467

Parents:

9e5ec99

Message:

Re #5 Make sure platform-specific build options are separated from openmp option

Files:

• sansmodels/setup.py (modified) (3 diffs)
• setup.py (modified) (3 diffs)

sansmodels/setup.py

@@ -4 +4 @@
 
 import sys
-
 import os
 import platform
@@ -15 +14 @@
 
 # Options to enable OpenMP
+copt =  {'msvc': ['/openmp'],
+         'mingw32' : ['-fopenmp'],
+         'unix' : ['-fopenmp']}
+lopt =  {'msvc': ['/MANIFEST'],
+         'mingw32' : ['-fopenmp'],
+         'unix' : ['-lgomp']}
+
+# Options for non-openmp builds. MSVC always needs MANIFEST
 if sys.argv[-1] == "-nomp":
-    # Disable OpenMP
     copt = {}
-    lopt = {}
-else:
-    print "openmp ENABLED"
-    copt =  {'msvc': ['/openmp'],
-             'mingw32' : ['-fopenmp'],
-             'unix' : ['-fopenmp']}
-    lopt =  {'msvc': ['/MANIFEST'],
-             'mingw32' : ['-fopenmp'],
-             'unix' : ['-lgomp']}
+    lopt = {'msvc': ['/MANIFEST']}
 
 class build_ext_subclass( build_ext ):
@@ -37 +35 @@
             is_64bits = False
         c = self.compiler.compiler_type
-
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
+        
         if not (sys.platform=='darwin' and not is_64bits):
             if copt.has_key(c):

setup.py

@@ -85 +85 @@
          'unix' : ['-lgomp']}
 
+# Platform-specific link options
+platform_lopt = {'msvc' : ['/MANIFEST']}
+
 class build_ext_subclass( build_ext ):
     def build_extensions(self):
@@ -91 +94 @@
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
         
+        # OpenMP build options
         if enable_openmp:
             if copt.has_key(c):
@@ -96 +100 @@
                    e.extra_compile_args = copt[ c ]
             if lopt.has_key(c):
-                
                 for e in self.extensions:
                     e.extra_link_args = lopt[ c ]
                     
+        # Platform-specific build options
+        if platform_lopt.has_key(c):
+            for e in self.extensions:
+                e.extra_link_args = platform_lopt[ c ]
+
         build_ext.build_extensions(self)