Changeset 318b5bbb in sasview for setup.py

Timestamp:

Dec 18, 2012 8:55:24 AM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

File:

• setup.py (modified) (3 diffs)

setup.py

@@ -219 +219 @@
 c_model_dir = os.path.join("sansmodels", "src", "c_models")
 smear_dir  = os.path.join("sansmodels", "src", "c_smearer")
+gen_dir  = os.path.join("sansmodels", "src", "c_gen")
 wrapper_dir  = os.path.join("sansmodels", "src", "python_wrapper", "generated")
 model_dir = os.path.join("sansmodels", "src", "sans","models")
@@ -282 +283 @@
 smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
                   os.path.join(smear_dir, "smearer_module.cpp")]
-
-
-
-
-
-
+geni_sources = [os.path.join(gen_dir, "sld2i_module.cpp")]
 if os.name=='nt':
     smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
-
+    geni_sources.append(os.path.join(igordir, "winFuncs.c"))
 ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
                                 sources=model_sources,                 
@@ -308 +304 @@
                                          os.path.join(smear_dir, 
                                                 "smearer2d_helper.cpp"),],
-                              include_dirs=[smear_dir,numpy_incl_path],
+                              include_dirs=[smear_dir, numpy_incl_path],
+                              ),
+                    
+                    Extension("sans.models.sans_extension.sld2i",
+                              sources = [os.path.join(gen_dir, 
+                                                "sld2i_module.cpp"),
+                                         os.path.join(gen_dir, 
+                                                "sld2i.cpp"),
+                                         os.path.join(c_model_dir, 
+                                                "libfunc.c"),
+                                         os.path.join(c_model_dir, 
+                                                "librefl.c"),],
+                              include_dirs=[gen_dir, includedir, 
+                                            c_model_dir, numpy_incl_path],
                               )
                     ] )