Commit 0ab2265f authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

[Cmake] Fix link to HPP packages.

parent 3f9b2313
...@@ -51,10 +51,10 @@ ADD_HPP_PKG(hpp_tutorial) ...@@ -51,10 +51,10 @@ ADD_HPP_PKG(hpp_tutorial)
FOREACH(PKG ${SETUP_DOC_PKG}) FOREACH(PKG ${SETUP_DOC_PKG})
ADD_PROJECT_DEPENDENCY(${PKG}) ADD_PROJECT_DEPENDENCY(${PKG})
STRING(REGEX REPLACE "[^a-zA-Z0-9]" "_" PREFIX "${PKG}") SET(PREFIX "${PKG}")
STRING(TOUPPER ${PREFIX} PREFIX) SET(DOC_VAR "${PKG}")
STRING(REGEX REPLACE "[^a-zA-Z0-9]" "" DOC_VAR "${PKG}") LIST(APPEND LOGGING_WATCHED_VARIABLES
STRING(TOUPPER ${DOC_VAR} DOC_VAR) ${PREFIX}_FOUND)
IF(${PREFIX}_FOUND) IF(${PREFIX}_FOUND)
IF(DEFINED ${PREFIX}_DOXYGENDOCDIR) IF(DEFINED ${PREFIX}_DOXYGENDOCDIR)
SET(DOC_PREFIX ${${PREFIX}_DOXYGENDOCDIR}) SET(DOC_PREFIX ${${PREFIX}_DOXYGENDOCDIR})
...@@ -90,6 +90,8 @@ make update ...@@ -90,6 +90,8 @@ make update
ENDIF(DEFINED ${PKG}_robotpkg_package) ENDIF(DEFINED ${PKG}_robotpkg_package)
CONFIGURE_FILE(doc/missing.dox.in ${CMAKE_BINARY_DIR}/doc/${PKG}-missing.dox @ONLY) CONFIGURE_FILE(doc/missing.dox.in ${CMAKE_BINARY_DIR}/doc/${PKG}-missing.dox @ONLY)
ENDIF(${PREFIX}_FOUND) ENDIF(${PREFIX}_FOUND)
LIST(APPEND LOGGING_WATCHED_VARIABLES ${DOC_VAR}_URL ${DOC_VAR}_LINK)
ENDFOREACH(PKG ${SETUP_DOC_PKG}) ENDFOREACH(PKG ${SETUP_DOC_PKG})
CONFIG_FILES(doc/main.dox doc/doxygenLayout.xml) CONFIG_FILES(doc/main.dox doc/doxygenLayout.xml)
......
...@@ -30,10 +30,10 @@ The packages are distributed into the following categories: ...@@ -30,10 +30,10 @@ The packages are distributed into the following categories:
<img src="../figures/archi.svg" alt="Overview of the architecture" style="max-height: 50vh"/> <img src="../figures/archi.svg" alt="Overview of the architecture" style="max-height: 50vh"/>
</td><td width="5%"> </td><td width="5%">
</td><td width="30%"> </td><td width="30%">
The algorithmic part, built on @HPPCORE_LINK@ is The algorithmic part, built on @hpp-core_LINK@ is
embedded in corba servers implemented by embedded in corba servers implemented by
@HPPCORBASERVER_LINK@ or extensions like @hpp-corbaserver_LINK@ or extensions like
@HPPMANIPULATIONCORBA_LINK@. @hpp-manipulation-corba_LINK@.
The corba servers are linked to executable \c hppcorbaserver. The corba servers are linked to executable \c hppcorbaserver.
<p></p> <p></p>
From a python terminal, clients to the corba servers can be created in order From a python terminal, clients to the corba servers can be created in order
...@@ -42,13 +42,13 @@ The packages are distributed into the following categories: ...@@ -42,13 +42,13 @@ The packages are distributed into the following categories:
<p></p> <p></p>
Results of path planning requests as well as individual configurations can Results of path planning requests as well as individual configurations can
be displayed in \c gepetto-gui via package be displayed in \c gepetto-gui via package
@HPPGEPETTOVIEWER_LINK@. @hpp-gepetto-viewer_LINK@.
</td></tr> </td></tr>
</table> </table>
\par Getting started \par Getting started
Package @HPPTUTORIAL_LINK@ provides some examples of Package @hpp_tutorial_LINK@ provides some examples of
how to use this project. how to use this project.
**/ **/
...@@ -59,27 +59,24 @@ how to use this project. ...@@ -59,27 +59,24 @@ how to use this project.
\section hpp_doc_algorithms_technical_tools Technical tools \section hpp_doc_algorithms_technical_tools Technical tools
- @HPPUTIL_LINK@: technical tools for the HPP project (logging, benchmark, quality assurance tools), - @hpp-util_LINK@: technical tools for the HPP project (logging, benchmark, quality assurance tools),
\section hpp_doc_algorithms_motion_planning Motion planning for humanoid systems \section hpp_doc_algorithms_motion_planning Motion planning for humanoid systems
\par Kinematic chain with geometry \par Kinematic chain with geometry
- @HPPFCL_LINK@: Modified version of Flexible collision library, for collision detection and distance computation, - @hpp-fcl_LINK@: Modified version of Flexible collision library, for collision detection and distance computation,
- @PINOCCHIO_LINK@: implementation of kinematic chain with dynamic computations, - @pinocchio_LINK@: implementation of kinematic chain with dynamic computations,
- @HPPPINOCCHIO_LINK@: Interface between pinocchio and hpp-core, - @hpp-pinocchio_LINK@: Interface between pinocchio and hpp-core,
\par Non linear constraints \par Non linear constraints
- @HPPCONSTRAINTS_LINK@: definition of some nonlinear constraints, - @hpp-constraints_LINK@: definition of some nonlinear constraints,
\par Path planning \par Path planning
- @HPPCORE_LINK@: definition of basic classes, path planning problems and solvers, - @hpp-core_LINK@: definition of basic classes, path planning problems and solvers,
\par Path Planning for humanoid robots
- @HPPWHOLEBODYSTEP_LINK@: whole-body and walk planning using sliding path approximation.
\par Manipulation Planning \par Manipulation Planning
- @HPPMANIPULATION_LINK@: Manipulation planning - @hpp-manipulation_LINK@: Manipulation planning
- @HPPMANIPULATIONURDF_LINK@: Manipulation planning - @hpp-manipulationurdf_LINK@: Manipulation planning
**/ **/
...@@ -90,8 +87,8 @@ how to use this project. ...@@ -90,8 +87,8 @@ how to use this project.
\par Packages implementing CORBA interfaces \par Packages implementing CORBA interfaces
The following packages implement Corba communication functionalities The following packages implement Corba communication functionalities
\li @HPPCORBASERVER_LINK@ : Corba server embedding a hpp::core::ProblemSolver instance. \li @hpp-corbaserver_LINK@ : Corba server embedding a hpp::core::ProblemSolver instance.
\li @HPPMANIPULATIONCORBA_LINK@ : Corba server for @HPPMANIPULATION_LINK@. \li @hpp-manipulation-corba_LINK@ : Corba server for @hpp-manipulation_LINK@.
**/ **/
...@@ -102,9 +99,9 @@ The following packages implement Corba communication functionalities ...@@ -102,9 +99,9 @@ The following packages implement Corba communication functionalities
\par Packages implementing graphical user interface \par Packages implementing graphical user interface
The following packages implement a corba connection with a graphical display The following packages implement a corba connection with a graphical display
\li @GEPETTOVIEWER_LINK@ : Graphical window based on OpenSceneGraph. \li @gepetto-viewer_LINK@ : Graphical window based on OpenSceneGraph.
\li @GEPETTOVIEWERCORBA_LINK@ : Corba interface to gepetto-gui. \li @gepetto-viewer-corba_LINK@ : Corba interface to gepetto-gui.
\li @HPPGEPETTOVIEWER_LINK@ : Link between hpp and gepetto-viewer-corba. \li @hpp-gepetto-viewer_LINK@ : Link between hpp and gepetto-viewer-corba.
**/ **/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment