[opengm] 20/50: Prevent collision between the Python modules and docs builds

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository opengm.

commit c2b0ad84476f103f2c8e8c0794c6cd62cbe00018
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Oct 22 14:08:31 2015 +0100

    Prevent collision between the Python modules and docs builds
---
 src/interfaces/python/CMakeLists.txt | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/interfaces/python/CMakeLists.txt b/src/interfaces/python/CMakeLists.txt
index d3150fe..0e329a7 100644
--- a/src/interfaces/python/CMakeLists.txt
+++ b/src/interfaces/python/CMakeLists.txt
@@ -30,22 +30,19 @@ if(BUILD_PYTHON_DOCS)
             set(SPHINX_THEME_DIR)
         endif()
         # configured documentation tools and intermediate build results
-        set(BINARY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/_build")
-        file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build)
+        set(SPHINX_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc/_build")
         # Sphinx cache with pickled ReST documents
-        set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/opengm/_doctrees")
+        set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc/_doctrees")
         # HTML output directory
-        set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/opengm/html")
+        set(SPHINX_HTML_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc/html")
         configure_file(
             "${CMAKE_CURRENT_SOURCE_DIR}/docsrc/source/conf.py.in"
-            #"${CMAKE_CURRENT_SOURCE_DIR}/docsrc/source/conf.py"
-            "${BINARY_BUILD_DIR}/conf.py"
+            "${SPHINX_BUILD_DIR}/conf.py"
             @ONLY)
         add_custom_target(python-doc ALL
             ${SPHINX_EXECUTABLE}
             -q -b html
-            #-c "${CMAKE_CURRENT_SOURCE_DIR}/docsrc/source"
-            -c "${BINARY_BUILD_DIR}"
+            -c "${SPHINX_BUILD_DIR}"
             -d "${SPHINX_CACHE_DIR}"
             "${CMAKE_CURRENT_SOURCE_DIR}/docsrc/source"
             "${SPHINX_HTML_DIR}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git