From 27db0e9566ffc5c09cd80aaa8153cdc700543d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraj=20Or=C5=A1uli=C4=87?= Date: Thu, 30 Mar 2017 10:21:03 +0200 Subject: [PATCH] Sphinx build fix (#291) This was missed in #262. The "build_doc" target has also been renamed to "build_doc_ros" in order to avoid conflict with the "build_doc" target in libcartographer, in case both are being built in the same CMake project. --- docs/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 6e2e221..ec58eef 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -18,8 +18,8 @@ project(cartographer_ros_docs) find_package(Sphinx) if(SPHINX_FOUND) - set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/docs/html") - add_custom_target(build_doc ALL + set(OUTPUT_DIR "${PROJECT_BINARY_DIR}/docs/html") + add_custom_target(build_doc_ros ALL ${SPHINX_EXECUTABLE} -b html ${CMAKE_CURRENT_SOURCE_DIR}/source ${CMAKE_CURRENT_BINARY_DIR}/html