[llvm-branch-commits] [lldb] r329664 - Merging r327016:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Apr  9 19:45:55 2018
New Revision: 329664

URL: http://llvm.org/viewvc/llvm-project?rev=329664&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    lldb/branches/release_60/cmake/modules/LLDBConfig.cmake

Modified: lldb/branches/release_60/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_60/cmake/modules/LLDBConfig.cmake?rev=329664&r1=329663&r2=329664&view=diff
==============================================================================
--- lldb/branches/release_60/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/branches/release_60/cmake/modules/LLDBConfig.cmake Mon Apr  9 19:45:55 2018
@@ -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"))