Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
moose
Manage
Activity
Members
Labels
Plan
Issues
9
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sahil Moza
moose
Commits
71ece59d
Commit
71ece59d
authored
7 years ago
by
Dilawar Singh
Browse files
Options
Downloads
Plain Diff
Merge commit '
d377194c
' into chamcham
parents
d10a3f87
d377194c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
moose-core/CMakeLists.txt
+4
-3
4 additions, 3 deletions
moose-core/CMakeLists.txt
moose-core/pymoose/CMakeLists.txt
+0
-1
0 additions, 1 deletion
moose-core/pymoose/CMakeLists.txt
moose-core/python/setup.cmake.py
+4
-3
4 additions, 3 deletions
moose-core/python/setup.cmake.py
with
8 additions
and
7 deletions
moose-core/CMakeLists.txt
+
4
−
3
View file @
71ece59d
...
...
@@ -445,12 +445,13 @@ file(GLOB_RECURSE PYTHON_SRCS "${CMAKE_SOURCE_DIR}/python/*")
add_custom_target
(
copy_pymoose DEPENDS
${
PYTHON_SRCS
}
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
CMAKE_CURRENT_SOURCE_DIR
}
/python
${
CMAKE_CURRENT_BINARY_DIR
}
/python
COMMENT
"Copying required python files and other files to build directory"
COMMENT
"Copying required python files from
${
CMAKE_CURRENT_SOURCE_DIR
}
/python to to build directory"
VERBATIM
)
add_dependencies
(
bdist copy_pymoose
)
add_dependencies
(
copy_pymoose
_moose
)
add_dependencies
(
_moose
bdist
)
######################### INSTALL ##############################################
...
...
@@ -463,7 +464,7 @@ install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/moose
)
# install pymoose bdist.
install
(
DIRECTORY
${
PYMOOSE_BDIST_INSTALL_DIR
}
/
install
(
DIRECTORY
${
PYMOOSE_BDIST_INSTALL_DIR
}
/
usr/
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
CONFIGURATIONS Release
)
...
...
This diff is collapsed.
Click to expand it.
moose-core/pymoose/CMakeLists.txt
+
0
−
1
View file @
71ece59d
...
...
@@ -11,7 +11,6 @@ set(PYMOOSE_SRCS
PyRun.cpp
)
# Build _moose.so in source directory and them copy everything to
# current binary directory using cmake.
add_library
(
_moose MODULE
${
PYMOOSE_SRCS
}
)
set
(
PYMOOSE_OUTPUT_DIRECTORY
"
${
CMAKE_SOURCE_DIR
}
/python/moose"
)
...
...
This diff is collapsed.
Click to expand it.
moose-core/python/setup.cmake.py
+
4
−
3
View file @
71ece59d
...
...
@@ -31,13 +31,14 @@ print( 'Got %s from VERSION file' % version )
# importlib is available only for python3.
suffix
=
'
.
so
'
suffix
=
'
so
'
try
:
import
importlib.machinery
suffix
=
importlib
.
machinery
.
EXTENSION_SUFFIXES
[
0
].
split
(
'
.
'
)[
-
1
]
print
(
'
[INFO] Suffix is %s
'
%
suffix
)
except
Exception
as
e
:
print
(
'
[WARN] Failed to determine importlib suffix
'
)
suffix
=
'
.
so
'
suffix
=
'
so
'
setup
(
name
=
'
pymoose
'
,
...
...
@@ -58,5 +59,5 @@ setup(
# by themselves. We notify them when they try to import SBML.
# install_requires = [ 'python-libsbml', 'numpy' ],
package_dir
=
{
'
moose
'
:
'
moose
'
,
'
rdesigneur
'
:
'
rdesigneur
'
},
package_data
=
{
'
moose
'
:
[
'
_moose
'
+
suffix
]
},
package_data
=
{
'
moose
'
:
[
'
_moose
.
'
+
suffix
]
},
)
This diff is collapsed.
Click to expand it.
Preview
0%
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