From beece3e9814938d310887481f629f1a6c0ad2bad Mon Sep 17 00:00:00 2001 From: Bhumit Attarde Date: Wed, 28 Sep 2022 12:00:33 +0530 Subject: [PATCH] build(docs): rm leftover sections --- cmake/HPX_Documentation.cmake | 20 +------------------- cmake/templates/autodoc.doxy.in | 18 ------------------ docs/CMakeLists.txt | 24 +----------------------- 3 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 cmake/templates/autodoc.doxy.in diff --git a/cmake/HPX_Documentation.cmake b/cmake/HPX_Documentation.cmake index aaac29a32c32..fe9b38887fcb 100644 --- a/cmake/HPX_Documentation.cmake +++ b/cmake/HPX_Documentation.cmake @@ -5,6 +5,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) +# find required packages if(HPX_WITH_DOCUMENTATION) find_package(Doxygen) find_package(Sphinx) @@ -27,22 +28,3 @@ if(HPX_WITH_DOCUMENTATION) set(HPX_WITH_DOCUMENTATION OFF) endif() endif() - -# C++ Source -> Doxygen XML -function(hpx_source_to_doxygen name) - set(options) - set(one_value_args) - set(multi_value_args DEPENDENCIES DOXYGEN_ARGS) - cmake_parse_arguments( - ${name} "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN} - ) - - add_custom_command( - OUTPUT "${name}/index.xml" - COMMAND "${DOXYGEN_EXECUTABLE}" ${${name}_DOXYGEN_ARGS} - "${CMAKE_CURRENT_BINARY_DIR}/${name}.doxy" - COMMENT "Generating Doxygen." - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${name}.doxy" ${${name}_DEPENDENCIES} - VERBATIM - ) -endfunction() diff --git a/cmake/templates/autodoc.doxy.in b/cmake/templates/autodoc.doxy.in deleted file mode 100644 index 94113e0f146d..000000000000 --- a/cmake/templates/autodoc.doxy.in +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2012 Bryce Adelstein-Lelbach -# -# SPDX-License-Identifier: BSL-1.0 -# Distributed under the Boost Software License, Version 1.0. (See accompanying -# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -EXTRACT_ALL = YES -EXPAND_ONLY_PREDEF = YES -GENERATE_HTML = NO -GENERATE_XML = YES -MACRO_EXPANSION = YES -PREDEFINED = @doxygen_definitions@ -XML_OUTPUT = @doxygen_output_file@ -OUTPUT_DIRECTORY = @doxygen_output_dir@ -GENERATE_LATEX = NO -INPUT = @doxygen_inputs@ -EXCLUDE_SYMBOLS = detail -EXTRACT_PRIVATE = NO diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index b2b06a9347a9..437aa6671b00 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -4,20 +4,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -# Add all files here which should be passed to doxygen -set(doxygen_dependencies - "${PROJECT_SOURCE_DIR}/components/component_storage/include/hpx/components/component_storage/migrate_from_storage.hpp" - "${PROJECT_SOURCE_DIR}/components/component_storage/include/hpx/components/component_storage/migrate_to_storage.hpp" -) - -# Definitions for autodoc.doxy.in -foreach(doxygen_input ${doxygen_dependencies}) - set(doxygen_inputs "${doxygen_inputs} ${doxygen_input}") -endforeach() - -set(doxygen_output_file "${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc") -set(doxygen_output_dir "${CMAKE_CURRENT_BINARY_DIR}/doxygen") - +# used while generating sphinx config file set(doxygen_definition_list "DOXYGEN:=1" "BOOST_SYSTEM_NOEXCEPT=" @@ -36,12 +23,6 @@ foreach(doxygen_predef ${doxygen_definition_list}) set(doxygen_definitions "${doxygen_definitions} \"${doxygen_predef}\"") endforeach() -hpx_info("Creating Doxyfile: ${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc.doxy") -configure_file( - "${PROJECT_SOURCE_DIR}/cmake/templates/autodoc.doxy.in" - "${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc.doxy" @ONLY -) - # Generate rst files with CMake variables and toolchains set(HPX_CMAKE_OPTIONS_RST "") foreach(_cat ${HPX_OPTION_CATEGORIES}) @@ -215,8 +196,6 @@ create_symbolic_link( "${PROJECT_SOURCE_DIR}/libs" "${CMAKE_CURRENT_BINARY_DIR}/libs" ) -hpx_source_to_doxygen(hpx_autodoc DEPENDENCIES ${doxygen_dependencies}) - add_custom_target(docs) add_custom_target(docs-html) add_custom_target(docs-singlehtml) @@ -258,7 +237,6 @@ foreach(output_format ${HPX_WITH_DOCUMENTATION_OUTPUT_FORMATS}) add_custom_command( OUTPUT "${SPHINX_DOCS_OUTPUT_FILE}" DEPENDS "${sphinx_source_files_build}" - "${CMAKE_CURRENT_BINARY_DIR}/hpx_autodoc/index.xml" COMMAND ${SPHINX_DOCS_BUILD_COMMAND} )