Changeset f9303b6 in sasview

Timestamp:

Dec 5, 2011 10:17:01 AM (12 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:

0f2c15d

Parents:

bc69dcc

Message:

Re #5 fixing samsmodels compilation on MSVC

File:

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

sansmodels/setup.py

@@ -30 +30 @@
                    "CSchulz.cpp",
                    "WrapperGenerator.py",
-                   "wrapping.py",
-                   "winFuncs.c"]
+                   "wrapping.py"
+                   ]
+if not os.name=='nt':
+    IGNORED_FILES.extend(["gamma_win.c","winFuncs.c"])
+
 EXTENSIONS = [".c", ".cpp"]
 
@@ -61 +64 @@
 
 
+smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
+                  os.path.join(smear_dir, "smearer_module.cpp")]
+if os.name=='nt':
+    smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
+
 dist = setup(
     name="sansmodels",
@@ -87 +95 @@
         # Smearer extension
         Extension("sans.models.sans_extension.smearer",
-                   sources = [os.path.join(smear_dir, 
-                                          "smearer.cpp"),
-                             os.path.join(smear_dir, "smearer_module.cpp"),],
-        include_dirs=[smear_dir, numpy_incl_path]),
+                   sources = smearer_sources,
+                   include_dirs=[smear_dir, numpy_incl_path]),
         Extension("sans.models.sans_extension.smearer2d_helper",
                   sources = [os.path.join(smear_dir, 
                                           "smearer2d_helper_module.cpp"),
                              os.path.join(smear_dir, "smearer2d_helper.cpp"),],
-        include_dirs=[smear_dir,numpy_incl_path]
+                  include_dirs=[smear_dir,numpy_incl_path]
         )
         ]