diff options
| -rw-r--r-- | llvm/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | llvm/docs/CMake.rst | 10 | ||||
| -rw-r--r-- | llvm/docs/CMakeLists.txt | 14 |
3 files changed, 25 insertions, 4 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index e6fac3249ed..18d4b9147c7 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -456,6 +456,11 @@ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OF option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) +set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" + CACHE STRING "Doxygen-generated HTML documentation install directory") +set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" + CACHE STRING "OCamldoc-generated HTML documentation install directory") + option (LLVM_BUILD_EXTERNAL_COMPILER_RT "Build compiler-rt as an external project." OFF) diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst index 9e7967cf395..7dc475be70b 100644 --- a/llvm/docs/CMake.rst +++ b/llvm/docs/CMake.rst @@ -431,6 +431,11 @@ LLVM-specific variables Uses .svg files instead of .png files for graphs in the Doxygen output. Defaults to OFF. +**LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING + The path to install Doxygen-generated HTML documentation to. This path can + either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to + `share/doc/llvm/doxygen-html`. + **LLVM_ENABLE_SPHINX**:BOOL If specified, CMake will search for the ``sphinx-build`` executable and will make the ``SPHINX_OUTPUT_HTML`` and ``SPHINX_OUTPUT_MAN`` CMake options available. @@ -461,6 +466,11 @@ LLVM-specific variables either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to `share/doc/llvm/html`. +**LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING + The path to install OCamldoc-generated HTML documentation to. This path can + either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to + `share/doc/llvm/ocaml-html`. + **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL OS X Only: If enabled CMake will generate a target named 'install-xcode-toolchain'. This target will create a directory at diff --git a/llvm/docs/CMakeLists.txt b/llvm/docs/CMakeLists.txt index 55d867f247d..ad2178dc587 100644 --- a/llvm/docs/CMakeLists.txt +++ b/llvm/docs/CMakeLists.txt @@ -93,8 +93,11 @@ if (LLVM_ENABLE_DOXYGEN) endif() if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html - DESTINATION docs/html) + # ./ suffix is needed to copy the contents of html directory without + # appending html/ into LLVM_INSTALL_DOXYGEN_HTML_DIR. + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen/html/. + COMPONENT doxygen-html + DESTINATION "${LLVM_INSTALL_DOXYGEN_HTML_DIR}") endif() endif() endif() @@ -154,7 +157,10 @@ if( NOT uses_ocaml LESS 0 AND LLVM_ENABLE_OCAMLDOC ) add_dependencies(ocaml_doc ${doc_targets}) if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ocamldoc/html - DESTINATION docs/ocaml/html) + # ./ suffix is needed to copy the contents of html directory without + # appending html/ into LLVM_INSTALL_OCAMLDOC_HTML_DIR. + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ocamldoc/html/. + COMPONENT ocamldoc-html + DESTINATION "${LLVM_INSTALL_OCAMLDOC_HTML_DIR}") endif() endif() |
