From bb96ba8c145de6f34ea56a44f13f6b63acc45b03 Mon Sep 17 00:00:00 2001
From: Matt Clarke <matt.clarke@stfc.ac.uk>
Date: Tue, 20 Nov 2007 13:59:08 +0000
Subject: [PATCH] Removed thirdparty includes. Refs #31
---
Code/Mantid/Build/SConstruct | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Build/SConstruct b/Code/Mantid/Build/SConstruct
index ee9c7159828..bd64ac7a0d4 100644
--- a/Code/Mantid/Build/SConstruct
+++ b/Code/Mantid/Build/SConstruct
@@ -11,8 +11,8 @@ libDirList = ['../', '.']
libList = ['python' + sys.version[0:3]]
cflags = []
dirList = []
+cppPaths = []
-cppPaths = ['../../Third_Party/include/']
dirpath=os.listdir("../")
while(len(dirpath)):
try:
@@ -43,8 +43,26 @@ if os.name == 'nt':
else:
#so this must be posix
+ boost_path = ''
+ poco_path = ''
+
+ #Get paths
+ f=open('Scons_Linux.conf', 'r')
+
+ for ln in f:
+ if ln.startswith('BOOST_ROOT'):
+ boost_path=ln[11:]
+ print 'Boost root = ' + boost_path
+ elif ln.startswith('POCO_ROOT'):
+ poco_path=ln[10:]
+ print 'Poco root = ' + poco_path
+
+ f.close()
+
cflags = ['-Wall', '-fPIC']
cppPaths.append('/usr/include/python' + sys.version[0:3])
+ cppPaths.append(poco_path + 'Foundation/include')
+ cppPaths.append(poco_path + 'Util/include')
#GET LIST OF CPPS
codeFolder = '/src'
@@ -71,3 +89,4 @@ env.Append( CCFLAGS = cflags)
#BUILD CODE
env.SharedLibrary('Mantid', listCpps, LIBS=[ ], LIBPATH=[ ], RPATH=libDirList)
+
--
GitLab