Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit b6df24f

Browse files
committed
Merging r327016:
------------------------------------------------------------------------ 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
1 parent 50b0daa commit b6df24f

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

cmake/modules/LLDBConfig.cmake

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,27 +277,31 @@ include_directories(BEFORE
277277

278278
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
279279
install(DIRECTORY include/
280-
COMPONENT lldb_headers
280+
COMPONENT lldb-headers
281281
DESTINATION include
282282
FILES_MATCHING
283283
PATTERN "*.h"
284284
PATTERN ".svn" EXCLUDE
285285
PATTERN ".cmake" EXCLUDE
286286
PATTERN "Config.h" EXCLUDE
287-
PATTERN "lldb-*.h" EXCLUDE
288-
PATTERN "API/*.h" EXCLUDE
289287
)
290288

291289
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
292-
COMPONENT lldb_headers
290+
COMPONENT lldb-headers
293291
DESTINATION include
294292
FILES_MATCHING
295293
PATTERN "*.h"
296294
PATTERN ".svn" EXCLUDE
297295
PATTERN ".cmake" EXCLUDE
298-
PATTERN "lldb-*.h" EXCLUDE
299-
PATTERN "API/*.h" EXCLUDE
300296
)
297+
298+
add_custom_target(lldb-headers)
299+
set_target_properties(lldb-headers PROPERTIES FOLDER "Misc")
300+
301+
if (NOT CMAKE_CONFIGURATION_TYPES)
302+
add_llvm_install_targets(install-lldb-headers
303+
COMPONENT lldb-headers)
304+
endif()
301305
endif()
302306

303307
if (NOT LIBXML2_FOUND AND NOT (CMAKE_SYSTEM_NAME MATCHES "Windows"))

0 commit comments

Comments
 (0)