Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
sot-talos-balance
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
sot-talos-balance
Commits
0e28cc79
Commit
0e28cc79
authored
6 years ago
by
Gabriele Buondonno
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] clean python module name
parent
a1269b47
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
CMakeLists.txt
+12
-6
12 additions, 6 deletions
CMakeLists.txt
src/CMakeLists.txt
+2
-2
2 additions, 2 deletions
src/CMakeLists.txt
with
14 additions
and
8 deletions
CMakeLists.txt
+
12
−
6
View file @
0e28cc79
...
...
@@ -56,12 +56,18 @@ PKG_CONFIG_APPEND_LIBS("sot-talos-balance")
SET
(
BOOST_COMPONENTS thread filesystem program_options unit_test_framework system regex
)
OPTION
(
BUILD_PYTHON_INTERFACE
"Build the python bindings"
ON
)
# name of the python module
IF
(
BUILD_PYTHON_INTERFACE
)
SET
(
SOTTALOSBALANCE_PYNAME sot_talos_balance
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
IF
(
BUILD_PYTHON_INTERFACE
)
FINDPYTHON
()
SET
(
BOOST_COMPONENTS
${
BOOST_COMPONENTS
}
python
)
ADD_REQUIRED_DEPENDENCY
(
"dynamic-graph-python >= 3.0.0"
)
SET
(
${
LIBRARY_NAME
}
_PYTHON_FILES python/*.py
)
SET
(
PYTHON_INSTALL_DIR
${
CMAKE_INSTALL_PREFIX
}
/
${
PYTHON_SITELIB
}
/
sot_talos_balance
)
SET
(
PYTHON_INSTALL_DIR
${
CMAKE_INSTALL_PREFIX
}
/
${
PYTHON_SITELIB
}
/
${
SOTTALOSBALANCE_PYNAME
}
)
INCLUDE_DIRECTORIES
(
${
PYTHON_INCLUDE_DIR
}
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
...
...
@@ -86,7 +92,7 @@ SET(${LIBRARY_NAME}_HEADERS
)
#INSTALL(FILES ${${LIBRARY_NAME}_HEADERS}
# DESTINATION include/sot/talos
-
balance
# DESTINATION include/sot/talos
_
balance
# PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
SET
(
${
LIBRARY_NAME
}
_SOURCES
${${
LIBRARY_NAME
}
_HEADERS
}
...
...
@@ -125,9 +131,9 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
INSTALL
(
TARGETS
${
LIBRARY_NAME
}
DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
IF
(
BUILD_PYTHON_INTERFACE
)
INSTALL
(
FILES python/
sot_talos_balance
/__init__.py
python/
sot_talos_balance
/main.py
DESTINATION
${
PYTHON_SITELIB
}
/
sot_talos_balance
)
INSTALL
(
FILES python/
${
SOTTALOSBALANCE_PYNAME
}
/__init__.py
python/
${
SOTTALOSBALANCE_PYNAME
}
/main.py
DESTINATION
${
PYTHON_SITELIB
}
/
${
SOTTALOSBALANCE_PYNAME
}
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
MACRO
(
DYNAMIC_GRAPH_CUSTOM_PYTHON_MODULE MODULENAME SUBMODULENAME LIBRARYNAME TARGETNAME
)
...
...
@@ -208,7 +214,7 @@ MACRO(DYNAMIC_GRAPH_CUSTOM_PYTHON_MODULE MODULENAME SUBMODULENAME LIBRARYNAME TA
ENDMACRO
(
DYNAMIC_GRAPH_CUSTOM_PYTHON_MODULE
)
MACRO
(
SOT_TALOS_BALANCE_PYTHON_MODULE SUBMODULENAME LIBRARYNAME TARGETNAME
)
DYNAMIC_GRAPH_CUSTOM_PYTHON_MODULE
(
sot_talos_balance
"
${
SUBMODULENAME
}
"
"
${
LIBRARYNAME
}
"
"
${
TARGETNAME
}
"
)
DYNAMIC_GRAPH_CUSTOM_PYTHON_MODULE
(
"
${
SOTTALOSBALANCE_PYNAME
}
"
"
${
SUBMODULENAME
}
"
"
${
LIBRARYNAME
}
"
"
${
TARGETNAME
}
"
)
ENDMACRO
(
SOT_TALOS_BALANCE_PYTHON_MODULE
)
ADD_SUBDIRECTORY
(
src
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
2
−
2
View file @
0e28cc79
...
...
@@ -107,7 +107,7 @@ IF(BUILD_PYTHON_INTERFACE)
# Install empty __init__.py files in intermediate directories.
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/
sot_talos_balance
/__init__.py
DESTINATION
${
PYTHON_SITELIB
}
/
sot_talos_balance
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
SOTTALOSBALANCE_PYNAME
}
/__init__.py
DESTINATION
${
PYTHON_SITELIB
}
/
${
SOTTALOSBALANCE_PYNAME
}
)
ENDIF
(
BUILD_PYTHON_INTERFACE
)
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