Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic-graph-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository 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
Guilhem Saurel
dynamic-graph-python
Commits
ca95f045
Commit
ca95f045
authored
13 years ago
by
olivier stasse
Committed by
Florent Lamiraux florent@laas.fr
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Synchronize and fix definition of PYTHON_SITELIB.
Python packages are now installed in site-packages instead of dist-packages.
parent
05d12a1d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake
+1
-1
1 addition, 1 deletion
cmake
src/CMakeLists.txt
+13
-18
13 additions, 18 deletions
src/CMakeLists.txt
with
14 additions
and
19 deletions
cmake
@
a72e0a07
Compare
667408d8
...
a72e0a07
Subproject commit
667408d85d75903b66a069d64f8dd6f8c1d95881
Subproject commit
a72e0a07f01bfb45230d8630cc14d36f5bb4243b
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
13
−
18
View file @
ca95f045
...
...
@@ -34,6 +34,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES
(
${
DYNAMIC_GRAPH_LIBRARY_DIRS
}
)
ADD_DEFINITIONS
(
${
DYNAMIC_GRAPH_CFLAGS
}
)
INCLUDE
(
../cmake/python.cmake
)
#
#
# Python interpreter
...
...
@@ -93,8 +94,9 @@ INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}
# Installation
#
EXEC_PROGRAM
(
${
PYTHON_EXECUTABLE
}
ARGS
"-c
\"
from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='')
\"
"
OUTPUT_VARIABLE PYTHON_SITELIB
)
EXEC_PROGRAM
(
${
PYTHON_EXECUTABLE
}
ARGS
"-c
\"
import sys, os; print os.sep.join(['lib', 'python' + sys.version[:3], 'site-packages'])
\"
"
OUTPUT_VARIABLE PYTHON_SITELIB
)
MESSAGE
(
STATUS
"PYTHON_SITELIB=
${
PYTHON_SITELIB
}
"
)
...
...
@@ -105,29 +107,22 @@ INSTALL(TARGETS ${PYTHON_MODULE}
${
PYTHON_INSTALL_DIR
}
)
SET
(
PYTHON_SOURCES
dynamic_graph/
__init__.py
dynamic_graph/
attrpath.py
dynamic_graph/
entity.py
dynamic_graph/
signal_base.py
dynamic_graph/
matlab.py
dynamic_graph/
script_shortcuts.py
dynamic_graph/
tools.py
)
__init__.py
attrpath.py
entity.py
signal_base.py
matlab.py
script_shortcuts.py
tools.py
)
SET
(
PYTHON_SOURCES_FULLPATH
""
)
FOREACH
(
SOURCE
${
PYTHON_SOURCES
}
)
SET
(
PYTHON_SOURCES_FULLPATH
${
PYTHON_SOURCES_FULLPATH
}
${
CMAKE_SOURCE_DIR
}
/src/
${
SOURCE
}
)
PYTHON_INSTALL_ON_SITE
(
dynamic_graph
${
SOURCE
}
)
ENDFOREACH
(
SOURCE
)
INSTALL
(
FILES
${
PYTHON_SOURCES_FULLPATH
}
DESTINATION
${
PYTHON_INSTALL_DIR
}
)
# --- ADD the wrap on the dg modules
INCLUDE
(
../cmake/python.cmake
)
EXEC_PROGRAM
(
"
${
PKG_CONFIG_EXECUTABLE
}
"
ARGS
"--variable=plugindir"
"dynamic-graph"
OUTPUT_VARIABLE
"DYNAMIC_GRAPH_PLUGIN_DIR"
)
...
...
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