Skip to content

Commit

Permalink
doc: cmake: Use proper dependencies
Browse files Browse the repository at this point in the history
Properly use add_dependencies() instead of DEPENDS for the custom
targets.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
  • Loading branch information
carlescufi committed Jul 17, 2018
1 parent 7fd3eb6 commit 7896451
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions doc/CMakeLists.txt
Expand Up @@ -70,11 +70,6 @@ add_custom_target(
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_LIST_DIR}/${DOC_LOG} COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_LIST_DIR}/${DOC_LOG}
) )


add_custom_target(
htmldocs
DEPENDS doxy html
)

add_custom_target( add_custom_target(
content content
COMMAND ${PYTHON_EXECUTABLE} scripts/extract_content.py COMMAND ${PYTHON_EXECUTABLE} scripts/extract_content.py
Expand Down Expand Up @@ -102,15 +97,23 @@ add_custom_target(


set(KI_SCRIPT ${ZEPHYR_BASE}/scripts/filter-known-issues.py) set(KI_SCRIPT ${ZEPHYR_BASE}/scripts/filter-known-issues.py)
set(CONFIG_DIR ${ZEPHYR_BASE}/.known-issues/doc) set(CONFIG_DIR ${ZEPHYR_BASE}/.known-issues/doc)
set(SPHINX_CMD COMMAND ${SPHINXBUILD} -w ${SPHINX_LOG} -N -t ${DOC_TAG} -b html ${ALLSPHINXOPTS} ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html)


add_custom_target( add_custom_target(
html html
COMMAND ${SPHINXBUILD} -w ${SPHINX_LOG} -N -t ${DOC_TAG} -b html ${ALLSPHINXOPTS} ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/html ${SPHINX_CMD}
# Merge the Doxygen and Sphinx logs into a single file # Merge the Doxygen and Sphinx logs into a single file
COMMAND ${CMAKE_COMMAND} -P ${ZEPHYR_BASE}/cmake/util/fmerge.cmake ${DOC_LOG} ${DOXY_LOG} ${SPHINX_LOG} COMMAND ${CMAKE_COMMAND} -P ${ZEPHYR_BASE}/cmake/util/fmerge.cmake ${DOC_LOG} ${DOXY_LOG} ${SPHINX_LOG}
COMMAND ${PYTHON_EXECUTABLE} ${KI_SCRIPT} --config-dir ${CONFIG_DIR} --errors ${DOC_WARN} --warnings ${DOC_WARN} ${DOC_LOG} COMMAND ${PYTHON_EXECUTABLE} ${KI_SCRIPT} --config-dir ${CONFIG_DIR} --errors ${DOC_WARN} --warnings ${DOC_WARN} ${DOC_LOG}
COMMAND ${CMAKE_COMMAND} -E remove_directory samples COMMAND ${CMAKE_COMMAND} -E remove_directory samples
COMMAND ${CMAKE_COMMAND} -E remove_directory boards COMMAND ${CMAKE_COMMAND} -E remove_directory boards
DEPENDS doxy content kconfig
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
) )

add_dependencies(html content doxy kconfig)

add_custom_target(
htmldocs
)
add_dependencies(htmldocs html)

0 comments on commit 7896451

Please sign in to comment.