[CMake] [4/4] Update a batch of plugins

This is extending the updates from r293696 to more LLDB plugins.

llvm-svn: 293701

11 files changed, 93 insertions, 16 deletions

diff --git a/lldb/source/Plugins/ScriptInterpreter/None/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/None/CMakeLists.txt
index 5692d2f9071..7e7dd5896f7 100644
--- a/lldb/source/Plugins/ScriptInterpreter/None/CMakeLists.txt
+++ b/lldb/source/Plugins/ScriptInterpreter/None/CMakeLists.txt
@@ -1,3 +1,7 @@
-add_lldb_library(lldbPluginScriptInterpreterNone
+add_lldb_library(lldbPluginScriptInterpreterNone PLUGIN
   ScriptInterpreterNone.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbInterpreter
   )
\ No newline at end of file
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
index 71f5807b6f6..c337fc7b587 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/CMakeLists.txt
@@ -1,5 +1,15 @@
-add_lldb_library(lldbPluginScriptInterpreterPython
+add_lldb_library(lldbPluginScriptInterpreterPython PLUGIN
   PythonDataObjects.cpp
   PythonExceptionState.cpp
   ScriptInterpreterPython.cpp
+
+  LINK_LIBS
+    lldbBreakpoint
+    lldbCore
+    lldbDataFormatters
+    lldbHost
+    lldbInterpreter
+    lldbTarget
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt b/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
index ce0e21b4ed3..e4859f4f8cd 100644
--- a/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
@@ -1,5 +1,9 @@
-list(APPEND SOURCES
+add_lldb_library(lldbPluginStructuredDataDarwinLog PLUGIN
   StructuredDataDarwinLog.cpp
-  )
 
-add_lldb_library(lldbPluginStructuredDataDarwinLog ${SOURCES})
+  LINK_LIBS
+    lldbBreakpoint
+    lldbCore
+    lldbInterpreter
+    lldbTarget
+  )
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
index 5ce20cc0989..fb468440f9e 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginSymbolFileDWARF
+add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN
   DIERef.cpp
   DWARFAbbreviationDeclaration.cpp
   DWARFASTParserClang.cpp
@@ -32,4 +32,20 @@ add_lldb_library(lldbPluginSymbolFileDWARF
   SymbolFileDWARFDwo.cpp
   SymbolFileDWARFDebugMap.cpp
   UniqueDWARFASTType.cpp
+
+  LINK_LIBS
+    clangAST
+    clangBasic
+    lldbCore
+    lldbExpression
+    lldbHost
+    lldbInterpreter
+    lldbSymbol
+    lldbTarget
+    lldbUtility
+    lldbPluginObjCLanguage
+    lldbPluginCPlusPlusLanguage
+    lldbPluginExpressionParserClang
+  LINK_COMPONENTS
+    Support
   )
diff --git a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
index 55aaadaf191..eca610ce790 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
@@ -1,7 +1,13 @@
-set(LLVM_LINK_COMPONENTS
-    DebugInfoPDB)
-
-add_lldb_library(lldbPluginSymbolFilePDB
+add_lldb_library(lldbPluginSymbolFilePDB PLUGIN
   PDBASTParser.cpp
   SymbolFilePDB.cpp
+
+  LINK_LIBS
+    clangAST
+    clangLex
+    lldbCore
+    lldbSymbol
+  LINK_COMPONENTS
+    DebugInfoPDB
+    Support
   )
diff --git a/lldb/source/Plugins/SymbolFile/Symtab/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/Symtab/CMakeLists.txt
index 20e406b08ab..a2e19bd283f 100644
--- a/lldb/source/Plugins/SymbolFile/Symtab/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/Symtab/CMakeLists.txt
@@ -1,3 +1,7 @@
-add_lldb_library(lldbPluginSymbolFileSymtab
+add_lldb_library(lldbPluginSymbolFileSymtab PLUGIN
   SymbolFileSymtab.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
   )
diff --git a/lldb/source/Plugins/SymbolVendor/ELF/CMakeLists.txt b/lldb/source/Plugins/SymbolVendor/ELF/CMakeLists.txt
index cffc2ef7459..e742fac9312 100644
--- a/lldb/source/Plugins/SymbolVendor/ELF/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolVendor/ELF/CMakeLists.txt
@@ -1,3 +1,8 @@
-add_lldb_library(lldbPluginSymbolVendorELF
+add_lldb_library(lldbPluginSymbolVendorELF PLUGIN
   SymbolVendorELF.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbHost
+    lldbSymbol
   )
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt b/lldb/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
index 093766ac07d..bbcdff9705a 100644
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
@@ -1,5 +1,10 @@
 include_directories(${LIBXML2_INCLUDE_DIR})
 
-add_lldb_library(lldbPluginSymbolVendorMacOSX
+add_lldb_library(lldbPluginSymbolVendorMacOSX PLUGIN
   SymbolVendorMacOSX.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbHost
+    lldbSymbol
   )
diff --git a/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt b/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
index d1580cce20d..ac5781b98b0 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/CMakeLists.txt
@@ -1,7 +1,17 @@
-add_lldb_library(lldbPluginSystemRuntimeMacOSX
+add_lldb_library(lldbPluginSystemRuntimeMacOSX PLUGIN
   AppleGetItemInfoHandler.cpp
   AppleGetPendingItemsHandler.cpp
   AppleGetQueuesHandler.cpp
   AppleGetThreadItemInfoHandler.cpp
   SystemRuntimeMacOSX.cpp
+
+  LINK_LIBS
+    lldbBreakpoint
+    lldbCore
+    lldbExpression
+    lldbHost
+    lldbSymbol
+    lldbTarget
+    lldbUtility
+    lldbPluginProcessUtility
   )
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt b/lldb/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
index 21673160bf4..7b7fd721f85 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/CMakeLists.txt
@@ -1,3 +1,8 @@
-add_lldb_library(lldbPluginUnwindAssemblyInstEmulation
+add_lldb_library(lldbPluginUnwindAssemblyInstEmulation PLUGIN
   UnwindAssemblyInstEmulation.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
   )
diff --git a/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt b/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
index 024b0dab2e2..8b05c544454 100644
--- a/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
+++ b/lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
@@ -1,4 +1,12 @@
-add_lldb_library(lldbPluginUnwindAssemblyX86
+add_lldb_library(lldbPluginUnwindAssemblyX86 PLUGIN
   UnwindAssembly-x86.cpp
   x86AssemblyInspectionEngine.cpp
+
+  LINK_LIBS
+    lldbCore
+    lldbSymbol
+    lldbTarget
+    lldbUtility
+  LINK_COMPONENTS
+    Support
   )