summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
Diffstat (limited to 'clang')
-rw-r--r--clang/CMakeLists.txt12
-rw-r--r--clang/docs/ReleaseNotes.rst4
2 files changed, 15 insertions, 1 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index be9a93d3df7..e36babd91d0 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -388,6 +388,7 @@ include_directories(BEFORE
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 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
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
)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 1ca6218ac64..14f5f5e21aa 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -156,7 +156,9 @@ release of Clang. Users of the build system should adjust accordingly.
- 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.
- ...
OpenPOWER on IntegriCloud