From d697b86c77a8e4a5fba46d387f9689fb904eaf76 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Wed, 16 Mar 2011 17:57:47 +0000
Subject: [PATCH] Refs #2615. Missed a couple of references to hard-coded
Python25 libraries.
---
Code/Mantid/Framework/PythonAPI/SConscript | 4 ----
Code/Mantid/Framework/SConstruct | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Code/Mantid/Framework/PythonAPI/SConscript b/Code/Mantid/Framework/PythonAPI/SConscript
index 3b6baa69ad7..4429458bfed 100644
--- a/Code/Mantid/Framework/PythonAPI/SConscript
+++ b/Code/Mantid/Framework/PythonAPI/SConscript
@@ -24,10 +24,6 @@ if os.name == 'posix':
myenv.Append(MYLIBLIST='boost_python' + myenv['BOOST_APPEND'])
# windows
else:
- #python_path = 'C:/Python25/'
- #myenv.Append(CPPPATH=python_path+'include/')
- #myenv.Append(MYLIBDIRLIST=python_path+'libs/')
- #myenv.Append(MYLIBLIST=python25)
myenv.Replace(SHLIBSUFFIX='.pyd')
listSharedObjects = MantidBuild.getSharedObjects(listCpps, myenv)
diff --git a/Code/Mantid/Framework/SConstruct b/Code/Mantid/Framework/SConstruct
index ca99c4adbe1..26983bf99ba 100644
--- a/Code/Mantid/Framework/SConstruct
+++ b/Code/Mantid/Framework/SConstruct
@@ -85,7 +85,7 @@ if os.name == 'nt':
boost_path = third_party + '/include/'
- python_path = 'C:/Python25/'
+ python_path = sys.prefix.replace('\\','/') + '/'
opencascade_path=third_party + '/include/OpenCascade'
if int(debug) == 0:
libList.append('PocoUtil')
@@ -107,7 +107,7 @@ if os.name == 'nt':
print "* Building for 64bit Windows *"
libDirList.append(third_party + '/lib/win64/')
- libList.append('python25')
+ libList.append('python%d%d' % (sys.version_info[0],sys.version_info[1]))
libList.append('gsl')
libList.append('ws2_32') # winsock library
--
GitLab