Merge pull request #346 from jcarpent/devel

Set installation of documentation as an option

.travis.yml

@@ -15,6 +15,7 @@ env:
     - CC=gcc
     - DO_COVERAGE_ON_BRANCH="master;release"
     - DO_CPPCHECK_ON_BRANCH=""
+    - DO_INSTALL_DOC_EXCEPT_ON_BRANCH=""
   matrix:
     # - BUILDTYPE=Release
     # - BUILDTYPE=Debug

CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(cmake/python.cmake)
 SET(PROJECT_NAME pinocchio)
 SET(PROJECT_DESCRIPTION "Rigid multi body dynamics algorithms")
 SET(PROJECT_URL "http://github.com/stack-of-tasks/pinocchio")
+OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" ON)
 
 SET(DOXYGEN_USE_MATHJAX YES)
 

cmake @ 45ea8074

-Subproject commit bd35ff07dc0ae377ba1d04815ff98a270d31f4d7
+Subproject commit 45ea8074e31604d3e4cc594baaa5abe9fac1921b

travis_custom/custom_build

@@ -7,8 +7,14 @@ set -v
 
 # Setup environment variables.
 export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DBUILD_BENCHMARK=\"ON\" -DBUILD_UNIT_TESTS=\"ON\" -DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
+if [[ ";${DO_INSTALL_DOC_EXCEPT_ON_BRANCH};" == *";${CI_BRANCH};"* ]]; then
+  export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"OFF\""
+else
+  export CMAKE_ADDITIONAL_OPTIONS=" ${CMAKE_ADDITIONAL_OPTIONS} -DINSTALL_DOCUMENTATION=\"ON\""
+fi
 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/opt/openrobots/lib/pkgconfig"
 export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/openrobots/lib"
+
 # Setup environment variables.
 . ./.travis/run ../.travis/build