diff options
| author | Tom Stellard <tstellar@redhat.com> | 2018-04-10 02:45:55 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2018-04-10 02:45:55 +0000 |
| commit | b6df24ff1b258b18041161b8f32ac316a3b5d8d9 (patch) | |
| tree | 6e2fadc8b170c324bc954e1037a6f9a99e37fc85 | |
| parent | 50b0daa322b7e77c6064e0327cb0824d8f2bbba1 (diff) | |
Merging r327016:release_60
------------------------------------------------------------------------
r327016 | labath | 2018-03-08 07:52:46 -0800 (Thu, 08 Mar 2018) | 8 lines
Install lldb's SB headers (pr36630)
These were removed in r309021 in what looks like an accidentally
committed change. This brings them back.
I also rename the header component to lldb-headers (instead of
lldb_headers) to match the llvm style and add a special
install-lldb-headers target, which installs just the headers.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/lldb/branches/release_60@329664 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/modules/LLDBConfig.cmake | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake index 8f75880df..24878b591 100644 --- a/cmake/modules/LLDBConfig.cmake +++ b/cmake/modules/LLDBConfig.cmake @@ -277,27 +277,31 @@ include_directories(BEFORE if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/ - COMPONENT lldb_headers + COMPONENT lldb-headers DESTINATION include FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN ".cmake" EXCLUDE PATTERN "Config.h" EXCLUDE - PATTERN "lldb-*.h" EXCLUDE - PATTERN "API/*.h" EXCLUDE ) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb_headers + COMPONENT lldb-headers DESTINATION include FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN ".cmake" EXCLUDE - PATTERN "lldb-*.h" EXCLUDE - PATTERN "API/*.h" EXCLUDE ) + + add_custom_target(lldb-headers) + set_target_properties(lldb-headers PROPERTIES FOLDER "Misc") + + if (NOT CMAKE_CONFIGURATION_TYPES) + add_llvm_install_targets(install-lldb-headers + COMPONENT lldb-headers) + endif() endif() if (NOT LIBXML2_FOUND AND NOT (CMAKE_SYSTEM_NAME MATCHES "Windows")) |