Merge pull request #34 from jmirabel/devel

Fix compilation on gepgitlab.

CMakeLists.txt

@@ -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()

cmake @ e336033a

-Subproject commit d22de8c53c3507df785b1fb3ab260d9fdfb65233
+Subproject commit e336033ac082730b483a22a13ab1054583581cce

doc/config/ubuntu-16.04-kinetic.sh

@@ -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