Changeset 860afc1 in sasview

Timestamp:

Oct 13, 2009 12:07:35 PM (15 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:

ff8f99b

Parents:

9170547

Message:

generalized the calling of python path for win/linux

File:

• sansmodels/src/setup.py (modified) (1 diff)

sansmodels/src/setup.py

@@ -13 +13 @@
 import os
 
-if sys.platform.count("win32")>0:
-    numpy_incl_path = os.path.join(sys.prefix, "Lib", "site-packages", "numpy", "core", "include", "numpy")
+toks = sys.version.split('.')
+if sys.platform.count("win32")>0 or sys.platform.count("win64"):
+    py_path = "lib"
 else:
-    numpy_incl_path = os.path.join(sys.prefix, "lib","python2.6", "site-packages", "numpy", "core", "include", "numpy")
+    py_path = os.path.join("lib","python"+toks[0]+"."+toks[1])
+numpy_incl_path = os.path.join(sys.prefix, py_path, "site-packages", "numpy", "core", "include", "numpy")
 
 def createODBcontent(class_name):