Unverified Commit 1aa1128e authored by Joseph Mirabel's avatar Joseph Mirabel Committed by GitHub
Browse files

Merge pull request #34 from jmirabel/devel

Fix compilation on gepgitlab.
parents af581abb ba178357
......@@ -108,8 +108,10 @@ INSTALL(DIRECTORY
doc/images
doc/figures
DESTINATION ${CMAKE_INSTALL_DOCDIR})
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen-xml/index.xml
DESTINATION ${CMAKE_INSTALL_DOCDIR}/doxygen-html)
IF(NOT DEFINED INSTALL_DOCUMENTATION OR ${INSTALL_DOCUMENTATION})
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/doxygen-xml/index.xml
DESTINATION ${CMAKE_INSTALL_DOCDIR}/doxygen-html)
ENDIF()
setup_project_finalize()
Subproject commit d22de8c53c3507df785b1fb3ab260d9fdfb65233
Subproject commit e336033ac082730b483a22a13ab1054583581cce
......@@ -17,4 +17,6 @@ fi
# otherwise, you should add it by hand in the line below.
export ROS_PACKAGE_PATH=$INSTALL_HPP_DIR/share:$ROS_PACKAGE_PATH
[ -f "${INSTALL_HPP_DIR}/etc/hpp-tools/bashrc" ] && source "${INSTALL_HPP_DIR}/etc/hpp-tools/bashrc"
if [ -f "${INSTALL_HPP_DIR}/etc/hpp-tools/bashrc" ]; then
source "${INSTALL_HPP_DIR}/etc/hpp-tools/bashrc"
fi
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