Changeset 1d10ee9 in sasview

Timestamp:

Nov 30, 2011 5:23:44 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:

ef70686

Parents:

61cce73

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -174 +174 @@
 packages.extend(["sans","sans.models","sans.models.sans_extension"])
     
+smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
+                  os.path.join(smear_dir, "smearer_module.cpp")]
+
+if not os.name=='nt':
+    smearer_sources.append("winFuncs.c")
+
 ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
                                 sources=model_sources,                 
@@ -179 +185 @@
                     # Smearer extension
                     Extension("sans.models.sans_extension.smearer",
-                              sources = [os.path.join(smear_dir, "smearer.cpp"),
-                                         os.path.join(smear_dir, "smearer_module.cpp"),],
+                              sources = smearer_sources,
                               include_dirs=[igordir, smear_dir, numpy_incl_path]),
                     
@@ -187 +192 @@
                                           "smearer2d_helper_module.cpp"),
                                           os.path.join(smear_dir, "smearer2d_helper.cpp"),],
-                              include_dirs=[igordir, smear_dir,numpy_incl_path])
+                              include_dirs=[smear_dir,numpy_incl_path])
                     ] )