From d40d55b3f4af444bebc5d1f211d1ba6480624cfd Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Wed, 2 Oct 2019 16:06:50 +0000 Subject: [PATCH] [llvm] [cmake] Add install targets for missing distribution components Add install targets as necessary to include all files normally installed in LLVM_DISTRIBUTION_COMPONENTS. This includes targets for Sphinx docs, opt-viewer Python modules and TableGens. Differential Revision: https://reviews.llvm.org/D68339 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@373482 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/modules/AddSphinxTarget.cmake | 11 +++++++++++ cmake/modules/TableGen.cmake | 6 ++++++ tools/opt-viewer/CMakeLists.txt | 7 +++++++ 3 files changed, 24 insertions(+) diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake index 22e3dcb776a..2bf654b60c4 100644 --- a/cmake/modules/AddSphinxTarget.cmake +++ b/cmake/modules/AddSphinxTarget.cmake @@ -71,6 +71,11 @@ function (add_sphinx_target builder project) COMPONENT "${project}-sphinx-man" DESTINATION ${INSTALL_MANDIR}man1) + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets("install-${SPHINX_TARGET_NAME}" + DEPENDS ${SPHINX_TARGET_NAME} + COMPONENT "${project}-sphinx-man") + endif() elseif (builder STREQUAL html) string(TOUPPER "${project}" project_upper) set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" @@ -82,6 +87,12 @@ function (add_sphinx_target builder project) install(DIRECTORY "${SPHINX_BUILD_DIR}/." COMPONENT "${project}-sphinx-html" DESTINATION "${${project_upper}_INSTALL_SPHINX_HTML_DIR}") + + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets("install-${SPHINX_TARGET_NAME}" + DEPENDS ${SPHINX_TARGET_NAME} + COMPONENT "${project}-sphinx-html") + endif() else() message(WARNING Installation of ${builder} not supported) endif() diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index 71dfebb12b4..38e755d6d15 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -171,7 +171,13 @@ macro(add_tablegen target project) install(TARGETS ${target} ${export_to_llvmexports} + COMPONENT ${target} RUNTIME DESTINATION ${LLVM_TOOLS_INSTALL_DIR}) + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets("install-${target}" + DEPENDS ${target} + COMPONENT ${target}) + endif() endif() set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${target}) endmacro() diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt index 19b60693308..ead73ec13a8 100644 --- a/tools/opt-viewer/CMakeLists.txt +++ b/tools/opt-viewer/CMakeLists.txt @@ -11,3 +11,10 @@ foreach (file ${files}) DESTINATION share/opt-viewer COMPONENT opt-viewer) endforeach (file) + +add_custom_target(opt-viewer DEPENDS ${files}) +if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets("install-opt-viewer" + DEPENDS opt-viewer + COMPONENT opt-viewer) +endif() -- 2.40.0