Mercurial > trustbridge
changeset 1185:69f7d302cdb9
Fix build with changed documentation paths
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Mon, 22 Sep 2014 13:11:30 +0200 |
| parents | cf1fdb254c41 |
| children | 3de099c8129e |
| files | CMakeLists.txt doc/apidoc/Doxyfile.in doc/help/CMakeLists.txt |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Mon Sep 22 13:02:11 2014 +0200 +++ b/CMakeLists.txt Mon Sep 22 13:11:30 2014 +0200 @@ -144,15 +144,15 @@ endif() # Documentation -configure_file (doc/Doxyfile.in doc/Doxyfile) -add_subdirectory(doc) +configure_file (doc/apidoc/Doxyfile.in doc/apidoc/Doxyfile) +add_subdirectory(doc/apidoc) find_package(Sphinx) if (NOT SPHINX_FOUND) message (STATUS "WARNING could not find sphinx (Package python-sphinx). Manuals will not be built.") else() - add_subdirectory(manuals) + add_subdirectory(doc/help) endif() add_subdirectory(packaging)
--- a/doc/apidoc/Doxyfile.in Mon Sep 22 13:02:11 2014 +0200 +++ b/doc/apidoc/Doxyfile.in Mon Sep 22 13:11:30 2014 +0200 @@ -52,7 +52,7 @@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/doc/generated +OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/doc/apidoc/generated # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output
--- a/doc/help/CMakeLists.txt Mon Sep 22 13:02:11 2014 +0200 +++ b/doc/help/CMakeLists.txt Mon Sep 22 13:11:30 2014 +0200 @@ -13,19 +13,19 @@ set(SPHINX_THEME_DIR "${CMAKE_CURRENT_SOURCE_DIR}/theme") endif() -set(ADMIN_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/admin-manual") -set(ADMIN_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/admin-manual") -set(HELP_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/help-manual") -set(HELP_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/help-manual") +set(ADMIN_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/admin") +set(ADMIN_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/admin") +set(HELP_MANUAL_IN "${CMAKE_CURRENT_SOURCE_DIR}/client") +set(HELP_MANUAL_OUT "${CMAKE_CURRENT_BINARY_DIR}/client") # configured documentation tools and intermediate build results set(BINARY_BUILD_DIR_ADMIN "${CMAKE_CURRENT_BINARY_DIR}/_build-admin") -set(BINARY_BUILD_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_build-help") +set(BINARY_BUILD_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_build-client") # Sphinx cache with pickled ReST documents set(SPHINX_CACHE_DIR_ADMIN "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-admin") -set(SPHINX_CACHE_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-help") +set(SPHINX_CACHE_DIR_HELP "${CMAKE_CURRENT_BINARY_DIR}/_doctrees-client") # HTML output directory set(SPHINX_HTML_DIR_ADMIN "${ADMIN_MANUAL_OUT}/html")