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
627c94b1
Commit
627c94b1
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] clean
parent
bcb31a7c
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
CMakeLists.txt
+1
-9
1 addition, 9 deletions
CMakeLists.txt
package.xml
+5
-5
5 additions, 5 deletions
package.xml
unitTesting/CMakeLists.txt
+0
-3
0 additions, 3 deletions
unitTesting/CMakeLists.txt
with
6 additions
and
17 deletions
CMakeLists.txt
+
1
−
9
View file @
627c94b1
...
@@ -7,14 +7,10 @@ SET(PROJECT_NAME dynamic-graph-python)
...
@@ -7,14 +7,10 @@ SET(PROJECT_NAME dynamic-graph-python)
SET
(
PROJECT_DESCRIPTION
"Dynamic graph library Python bindings"
)
SET
(
PROJECT_DESCRIPTION
"Dynamic graph library Python bindings"
)
SET
(
PROJECT_URL
"http://github.com/
${
PROJECT_NAMESPACE
}
/
${
PROJECT_NAME
}
"
)
SET
(
PROJECT_URL
"http://github.com/
${
PROJECT_NAMESPACE
}
/
${
PROJECT_NAME
}
"
)
# Export CMake Target
SET
(
PROJECT_USE_CMAKE_EXPORT TRUE
)
SET
(
PROJECT_USE_CMAKE_EXPORT TRUE
)
# Make sure that every header is generated in dynamic-graph
SET
(
CUSTOM_HEADER_DIR
"dynamic-graph/python"
)
SET
(
CUSTOM_HEADER_DIR
"dynamic-graph/python"
)
# Do not fail on warning
SET
(
CXX_DISABLE_WERROR TRUE
)
SET
(
CXX_DISABLE_WERROR TRUE
)
SET
(
DOXYGEN_USE_MATHJAX YES
)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/boost.cmake
)
...
@@ -23,10 +19,6 @@ INCLUDE(cmake/python.cmake)
...
@@ -23,10 +19,6 @@ INCLUDE(cmake/python.cmake)
INCLUDE
(
cmake/test.cmake
)
INCLUDE
(
cmake/test.cmake
)
INCLUDE
(
cmake/sphinx.cmake
)
INCLUDE
(
cmake/sphinx.cmake
)
SET
(
DOXYGEN_USE_MATHJAX YES
)
SET
(
CUSTOM_HEADER_DIR
"dynamic-graph/python"
)
SET
(
PKG_CONFIG_ADDITIONAL_VARIABLES plugindir
${
PKG_CONFIG_ADDITIONAL_VARIABLES
}
)
SET
(
PKG_CONFIG_ADDITIONAL_VARIABLES plugindir
${
PKG_CONFIG_ADDITIONAL_VARIABLES
}
)
CMAKE_POLICY
(
SET CMP0048 OLD
)
CMAKE_POLICY
(
SET CMP0048 OLD
)
...
...
This diff is collapsed.
Click to expand it.
package.xml
+
5
−
5
View file @
627c94b1
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
</description>
</description>
<maintainer
email=
"ostasse@laas.fr"
>
Olivier Stasse
</maintainer>
<maintainer
email=
"ostasse@laas.fr"
>
Olivier Stasse
</maintainer>
<license>
BSD
</license>
<license>
BSD
</license>
<url>
http://github.com/stack-of-tasks/dynamic-graph-python
</url>
<url>
http://github.com/stack-of-tasks/dynamic-graph-python
</url>
<author>
Nicolas Mansard
</author>
<author>
Nicolas Mansard
</author>
<author>
Olivier Stasse
</author>
<author>
Olivier Stasse
</author>
...
@@ -17,11 +17,11 @@
...
@@ -17,11 +17,11 @@
<exec_depend>
roscpp
</exec_depend>
<exec_depend>
roscpp
</exec_depend>
<exec_depend>
dynamic-graph
</exec_depend>
<exec_depend>
dynamic-graph
</exec_depend>
<build_export_depend>
roscpp
</build_export_depend>
<build_export_depend>
roscpp
</build_export_depend>
<build_export_depend>
dynamic-graph
</build_export_depend>
<build_export_depend>
dynamic-graph
</build_export_depend>
<buildtool_depend>
catkin
</buildtool_depend>
<buildtool_depend>
catkin
</buildtool_depend>
<doc_depend>
doxygen
</doc_depend>
<doc_depend>
doxygen
</doc_depend>
</package>
</package>
This diff is collapsed.
Click to expand it.
unitTesting/CMakeLists.txt
+
0
−
3
View file @
627c94b1
...
@@ -35,11 +35,8 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME}
...
@@ -35,11 +35,8 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME}
SOVERSION
${
PROJECT_VERSION
}
SOVERSION
${
PROJECT_VERSION
}
INSTALL_RPATH
${
DYNAMIC_GRAPH_PLUGINDIR
}
)
INSTALL_RPATH
${
DYNAMIC_GRAPH_PLUGINDIR
}
)
#add_dependencies(${LIBRARY_NAME} dynamic-graph)
target_link_libraries
(
${
LIBRARY_NAME
}
dynamic-graph::dynamic-graph
)
target_link_libraries
(
${
LIBRARY_NAME
}
dynamic-graph::dynamic-graph
)
#PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} dynamic-graph)
## Create its bindings
## Create its bindings
## This mimics DYNAMIC_GRAPH_PYTHON_MODULE(${LIBRARY_NAME} ${LIBRARY_NAME} "${LIBRARY_NAME}-wrap")
## This mimics DYNAMIC_GRAPH_PYTHON_MODULE(${LIBRARY_NAME} ${LIBRARY_NAME} "${LIBRARY_NAME}-wrap")
...
...
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