This revision was automatically updated to reflect the committed changes. Closed by commit rL355853: [clang] Add install targets for API headers (authored by smeenai, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D58317?vs=189199&id=190135#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D58317/new/ https://reviews.llvm.org/D58317 Files: cfe/trunk/CMakeLists.txt cfe/trunk/docs/ReleaseNotes.rst Index: cfe/trunk/docs/ReleaseNotes.rst =================================================================== --- cfe/trunk/docs/ReleaseNotes.rst +++ cfe/trunk/docs/ReleaseNotes.rst @@ -156,7 +156,9 @@ - In 8.0.0 and below, the install-clang-headers target would install clang's resource directory headers. This installation is now performed by the install-clang-resource-headers target. Users of the old install-clang-headers - target should switch to the new install-clang-resource-headers target. + target should switch to the new install-clang-resource-headers target. The + install-clang-headers target now installs clang's API headers (corresponding + to its libraries), which is consistent with the install-llvm-headers target. - ... Index: cfe/trunk/CMakeLists.txt =================================================================== --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -388,6 +388,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/clang include/clang-c DESTINATION include + COMPONENT clang-headers FILES_MATCHING PATTERN "*.def" PATTERN "*.h" @@ -397,12 +398,23 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang DESTINATION include + COMPONENT clang-headers FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE PATTERN "*.inc" PATTERN "*.h" ) + # Installing the headers needs to depend on generating any public + # tablegen'd headers. + add_custom_target(clang-headers DEPENDS clang-tablegen-targets) + set_target_properties(clang-headers PROPERTIES FOLDER "Misc") + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-clang-headers + DEPENDS clang-headers + COMPONENT clang-headers) + endif() + install(PROGRAMS utils/bash-autocomplete.sh DESTINATION share/clang )
Index: cfe/trunk/docs/ReleaseNotes.rst =================================================================== --- cfe/trunk/docs/ReleaseNotes.rst +++ cfe/trunk/docs/ReleaseNotes.rst @@ -156,7 +156,9 @@ - In 8.0.0 and below, the install-clang-headers target would install clang's resource directory headers. This installation is now performed by the install-clang-resource-headers target. Users of the old install-clang-headers - target should switch to the new install-clang-resource-headers target. + target should switch to the new install-clang-resource-headers target. The + install-clang-headers target now installs clang's API headers (corresponding + to its libraries), which is consistent with the install-llvm-headers target. - ... Index: cfe/trunk/CMakeLists.txt =================================================================== --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -388,6 +388,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/clang include/clang-c DESTINATION include + COMPONENT clang-headers FILES_MATCHING PATTERN "*.def" PATTERN "*.h" @@ -397,12 +398,23 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang DESTINATION include + COMPONENT clang-headers FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE PATTERN "*.inc" PATTERN "*.h" ) + # Installing the headers needs to depend on generating any public + # tablegen'd headers. + add_custom_target(clang-headers DEPENDS clang-tablegen-targets) + set_target_properties(clang-headers PROPERTIES FOLDER "Misc") + if(NOT LLVM_ENABLE_IDE) + add_llvm_install_targets(install-clang-headers + DEPENDS clang-headers + COMPONENT clang-headers) + endif() + install(PROGRAMS utils/bash-autocomplete.sh DESTINATION share/clang )
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits