Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
d697b86c
Commit
d697b86c
authored
14 years ago
by
Gigg, Martyn Anthony
Browse files
Options
Downloads
Patches
Plain Diff
Refs #2615. Missed a couple of references to hard-coded Python25 libraries.
parent
28894b5c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Framework/PythonAPI/SConscript
+0
-4
0 additions, 4 deletions
Code/Mantid/Framework/PythonAPI/SConscript
Code/Mantid/Framework/SConstruct
+2
-2
2 additions, 2 deletions
Code/Mantid/Framework/SConstruct
with
2 additions
and
6 deletions
Code/Mantid/Framework/PythonAPI/SConscript
+
0
−
4
View file @
d697b86c
...
@@ -24,10 +24,6 @@ if os.name == 'posix':
...
@@ -24,10 +24,6 @@ if os.name == 'posix':
myenv
.
Append
(
MYLIBLIST
=
'
boost_python
'
+
myenv
[
'
BOOST_APPEND
'
])
myenv
.
Append
(
MYLIBLIST
=
'
boost_python
'
+
myenv
[
'
BOOST_APPEND
'
])
# windows
# windows
else
:
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
'
)
myenv
.
Replace
(
SHLIBSUFFIX
=
'
.pyd
'
)
listSharedObjects
=
MantidBuild
.
getSharedObjects
(
listCpps
,
myenv
)
listSharedObjects
=
MantidBuild
.
getSharedObjects
(
listCpps
,
myenv
)
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/Framework/SConstruct
+
2
−
2
View file @
d697b86c
...
@@ -85,7 +85,7 @@ if os.name == 'nt':
...
@@ -85,7 +85,7 @@ if os.name == 'nt':
boost_path
=
third_party
+
'
/include/
'
boost_path
=
third_party
+
'
/include/
'
python_path
=
'
C:/Python25
/
'
python_path
=
sys
.
prefix
.
replace
(
'
\\
'
,
'
/
'
)
+
'
/
'
opencascade_path
=
third_party
+
'
/include/OpenCascade
'
opencascade_path
=
third_party
+
'
/include/OpenCascade
'
if
int
(
debug
)
==
0
:
if
int
(
debug
)
==
0
:
libList
.
append
(
'
PocoUtil
'
)
libList
.
append
(
'
PocoUtil
'
)
...
@@ -107,7 +107,7 @@ if os.name == 'nt':
...
@@ -107,7 +107,7 @@ if os.name == 'nt':
print
"
* Building for 64bit Windows *
"
print
"
* Building for 64bit Windows *
"
libDirList
.
append
(
third_party
+
'
/lib/win64/
'
)
libDirList
.
append
(
third_party
+
'
/lib/win64/
'
)
libList
.
append
(
'
python
25
'
)
libList
.
append
(
'
python
%d%d
'
%
(
sys
.
version_info
[
0
],
sys
.
version_info
[
1
])
)
libList
.
append
(
'
gsl
'
)
libList
.
append
(
'
gsl
'
)
libList
.
append
(
'
ws2_32
'
)
# winsock library
libList
.
append
(
'
ws2_32
'
)
# winsock library
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment