Added an Xcode target so we build the "lldb-mi" executable as part of the "desktop" and "desktop no xpc" targets.

Include paths were switched to be user include paths, if this breaks the linux build we will need to fix the Makefiles/cmake stuff.

<rdar://problem/19198581> 

llvm-svn: 226530

32 files changed, 74 insertions, 74 deletions

diff --git a/lldb/tools/lldb-mi/Driver.cpp b/lldb/tools/lldb-mi/Driver.cpp
index 34a2471e967..2a907636723 100644
--- a/lldb/tools/lldb-mi/Driver.cpp
+++ b/lldb/tools/lldb-mi/Driver.cpp
@@ -27,17 +27,17 @@
 #ifdef _MSC_VER
 #include <lldb\Host\windows\getopt\GetOptInc.h>
 #endif // _MSC_VER
-#include <lldb/API/SBBreakpoint.h>
-#include <lldb/API/SBCommandInterpreter.h>
-#include <lldb/API/SBCommandReturnObject.h>
-#include <lldb/API/SBCommunication.h>
-#include <lldb/API/SBEvent.h>
-#include <lldb/API/SBHostOS.h>
-#include <lldb/API/SBListener.h>
-#include <lldb/API/SBStream.h>
-#include <lldb/API/SBTarget.h>
-#include <lldb/API/SBThread.h>
-#include <lldb/API/SBProcess.h>
+#include "lldb/API/SBBreakpoint.h"
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBCommandReturnObject.h"
+#include "lldb/API/SBCommunication.h"
+#include "lldb/API/SBEvent.h"
+#include "lldb/API/SBHostOS.h"
+#include "lldb/API/SBListener.h"
+#include "lldb/API/SBStream.h"
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBThread.h"
+#include "lldb/API/SBProcess.h"
 
 using namespace lldb;
 
diff --git a/lldb/tools/lldb-mi/Driver.h b/lldb/tools/lldb-mi/Driver.h
index 41fc21da407..5bc97383a0c 100644
--- a/lldb/tools/lldb-mi/Driver.h
+++ b/lldb/tools/lldb-mi/Driver.h
@@ -15,17 +15,17 @@
 #define lldb_Driver_h_
 
 //#include "Platform.h" // IOR removed
-#include <lldb/Utility/PseudoTerminal.h>
+#include "lldb/Utility/PseudoTerminal.h"
 
 #include <set>
 #include <bitset>
 #include <string>
 #include <vector>
 
-#include <lldb/API/SBDefines.h>
-#include <lldb/API/SBBroadcaster.h>
-#include <lldb/API/SBDebugger.h>
-#include <lldb/API/SBError.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBBroadcaster.h"
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBError.h"
 #include "MIDriverMgr.h"
 #include "MIDriverBase.h"
 
diff --git a/lldb/tools/lldb-mi/MICmdCmd.h b/lldb/tools/lldb-mi/MICmdCmd.h
index b51318fa9df..1fd363084b4 100644
--- a/lldb/tools/lldb-mi/MICmdCmd.h
+++ b/lldb/tools/lldb-mi/MICmdCmd.h
@@ -38,8 +38,8 @@ MI commands implemented are:
 
 // Third party headers:
 #include <vector>
-#include <lldb/API/SBBreakpoint.h>
-#include <lldb/API/SBCommandReturnObject.h>
+#include "lldb/API/SBBreakpoint.h"
+#include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdBase.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdBreak.cpp b/lldb/tools/lldb-mi/MICmdCmdBreak.cpp
index c338cf0a363..21282909c4a 100644
--- a/lldb/tools/lldb-mi/MICmdCmdBreak.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdBreak.cpp
@@ -25,7 +25,7 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBBreakpointLocation.h>
+#include "lldb/API/SBBreakpointLocation.h"
 
 // In-house headers:
 #include "MICmdCmdBreak.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdBreak.h b/lldb/tools/lldb-mi/MICmdCmdBreak.h
index c9540b0521e..371afa15b63 100644
--- a/lldb/tools/lldb-mi/MICmdCmdBreak.h
+++ b/lldb/tools/lldb-mi/MICmdCmdBreak.h
@@ -36,7 +36,7 @@
 #pragma once
 
 // Third party headers:
-#include <lldb/API/SBBreakpoint.h>
+#include "lldb/API/SBBreakpoint.h"
 
 // In-house headers:
 #include "MICmdBase.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdData.cpp b/lldb/tools/lldb-mi/MICmdCmdData.cpp
index e1abe83b916..e63dc1dbb02 100644
--- a/lldb/tools/lldb-mi/MICmdCmdData.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdData.cpp
@@ -28,10 +28,10 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBThread.h>
-#include <lldb/API/SBInstruction.h>
-#include <lldb/API/SBInstructionList.h>
-#include <lldb/API/SBStream.h>
+#include "lldb/API/SBThread.h"
+#include "lldb/API/SBInstruction.h"
+#include "lldb/API/SBInstructionList.h"
+#include "lldb/API/SBStream.h"
 
 // In-house headers:
 #include "MICmdCmdData.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdExec.cpp b/lldb/tools/lldb-mi/MICmdCmdExec.cpp
index 9e1224363f5..1e99b875553 100644
--- a/lldb/tools/lldb-mi/MICmdCmdExec.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdExec.cpp
@@ -27,9 +27,9 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBCommandInterpreter.h>
-#include <lldb/API/SBProcess.h>
-#include <lldb/API/SBStream.h>
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBStream.h"
 #include "lldb/lldb-enumerations.h"
 
 // In-house headers:
diff --git a/lldb/tools/lldb-mi/MICmdCmdExec.h b/lldb/tools/lldb-mi/MICmdCmdExec.h
index cf59ec4f5b3..be03d6b9356 100644
--- a/lldb/tools/lldb-mi/MICmdCmdExec.h
+++ b/lldb/tools/lldb-mi/MICmdCmdExec.h
@@ -38,7 +38,7 @@
 #pragma once
 
 // Third party headers:
-#include <lldb/API/SBCommandReturnObject.h>
+#include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdBase.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdFile.cpp b/lldb/tools/lldb-mi/MICmdCmdFile.cpp
index a954f88dac1..671f3fe6f1a 100644
--- a/lldb/tools/lldb-mi/MICmdCmdFile.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdFile.cpp
@@ -20,7 +20,7 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBStream.h>
+#include "lldb/API/SBStream.h"
 
 // In-house headers:
 #include "MICmdCmdFile.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
index dde6a0b4013..4b2f0a783ef 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
@@ -20,7 +20,7 @@
 //--
 
 // Third party headers:
-#include <lldb/API/SBCommandReturnObject.h>
+#include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdCmdGdbInfo.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp
index 6b863a8ea8d..4bbd03d82cb 100644
--- a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.cpp
@@ -23,8 +23,8 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBCommandInterpreter.h>
-#include <lldb/API/SBThread.h>
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBThread.h"
 
 // In-house headers:
 #include "MICmdCmdMiscellanous.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h
index 1cabbac7e80..fd990940e44 100644
--- a/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h
+++ b/lldb/tools/lldb-mi/MICmdCmdMiscellanous.h
@@ -34,7 +34,7 @@
 #pragma once
 
 // Third party headers:
-#include <lldb/API/SBCommandReturnObject.h>
+#include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdBase.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdStack.cpp b/lldb/tools/lldb-mi/MICmdCmdStack.cpp
index 4ed6803a1ed..dcf6c3e8b02 100644
--- a/lldb/tools/lldb-mi/MICmdCmdStack.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdStack.cpp
@@ -23,7 +23,7 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBThread.h>
+#include "lldb/API/SBThread.h"
 
 // In-house headers:
 #include "MICmdCmdStack.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdTarget.cpp b/lldb/tools/lldb-mi/MICmdCmdTarget.cpp
index ec19493af33..36dfd487846 100644
--- a/lldb/tools/lldb-mi/MICmdCmdTarget.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdTarget.cpp
@@ -20,9 +20,9 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBStream.h>
-#include <lldb/API/SBCommandInterpreter.h>
-#include <lldb/API/SBCommandReturnObject.h>
+#include "lldb/API/SBStream.h"
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBCommandReturnObject.h"
 
 // In-house headers:
 #include "MICmdCmdTarget.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdThread.cpp b/lldb/tools/lldb-mi/MICmdCmdThread.cpp
index 3a448a77700..bc36260810f 100644
--- a/lldb/tools/lldb-mi/MICmdCmdThread.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdThread.cpp
@@ -20,8 +20,8 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBBreakpointLocation.h>
-#include <lldb/API/SBThread.h>
+#include "lldb/API/SBBreakpointLocation.h"
+#include "lldb/API/SBThread.h"
 
 // In-house headers:
 #include "MICmdCmdThread.h"
diff --git a/lldb/tools/lldb-mi/MICmdCmdVar.cpp b/lldb/tools/lldb-mi/MICmdCmdVar.cpp
index 4aa4c2ae97c..9eebffc43d8 100644
--- a/lldb/tools/lldb-mi/MICmdCmdVar.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdVar.cpp
@@ -28,8 +28,8 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBStream.h>
-#include <lldb/API/SBThread.h>
+#include "lldb/API/SBStream.h"
+#include "lldb/API/SBThread.h"
 
 // In-house headers:
 #include "MICmdCmdVar.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h b/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h
index 70d09258941..62ca0542dbf 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBBroadcaster.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // In-house headers:
-#include <lldb/API/SBBroadcaster.h>
+#include "lldb/API/SBBroadcaster.h"
 #include "MICmnBase.h"
 #include "MIUtilSingletonBase.h"
 
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
index 3e9ed226182..4a810be7e5f 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp
@@ -20,13 +20,13 @@
 //--
 
 // Third party headers:
-#include <lldb/API/SBThread.h>
+#include "lldb/API/SBThread.h"
 #ifdef _WIN32
 #include <io.h> // For the ::_access()
 #else
 #include <unistd.h> // For the ::access()
 #endif              // _WIN32
-#include <lldb/API/SBBreakpointLocation.h>
+#include "lldb/API/SBBreakpointLocation.h"
 
 // In-house headers:
 #include "MICmnLLDBDebugSessionInfo.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h
index e2463f1c89c..e45f3ca2da1 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h
@@ -24,10 +24,10 @@
 // Third party headers:
 #include <map>
 #include <vector>
-#include <lldb/API/SBDebugger.h>
-#include <lldb/API/SBListener.h>
-#include <lldb/API/SBProcess.h>
-#include <lldb/API/SBTarget.h>
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBListener.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBTarget.h"
 
 // In-house headers:
 #include "MICmnBase.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h
index 94f62a42aa6..ecc960c85d0 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h
@@ -23,7 +23,7 @@
 
 // Third Party Headers:
 #include <map>
-#include <lldb/API/SBValue.h>
+#include "lldb/API/SBValue.h"
 
 // In-house headers:
 #include "MIUtilString.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugger.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebugger.cpp
index 273b805156f..dc3ad4b0341 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugger.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugger.cpp
@@ -20,10 +20,10 @@
 //--
 
 // Third party headers:
-#include <lldb/API/SBTarget.h>
-#include <lldb/API/SBThread.h>
-#include <lldb/API/SBProcess.h>
-#include <lldb/API/SBCommandInterpreter.h>
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBThread.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBCommandInterpreter.h"
 
 // In-house headers:
 #include "MICmnLLDBDebugger.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebugger.h b/lldb/tools/lldb-mi/MICmnLLDBDebugger.h
index 6075fd85e53..403d71d0e32 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebugger.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebugger.h
@@ -24,9 +24,9 @@
 // Third party headers
 #include <queue>
 #include <map>
-#include <lldb/API/SBDebugger.h>
-#include <lldb/API/SBListener.h>
-#include <lldb/API/SBEvent.h>
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBListener.h"
+#include "lldb/API/SBEvent.h"
 
 // In-house headers:
 #include "MICmnBase.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
index b375611ec6e..ba9785ff9c1 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp
@@ -20,13 +20,13 @@
 //--
 
 // Third party headers:
-#include <lldb/API/SBEvent.h>
-#include <lldb/API/SBProcess.h>
-#include <lldb/API/SBBreakpoint.h>
-#include <lldb/API/SBStream.h>
-#include <lldb/API/SBThread.h>
-#include <lldb/API/SBCommandInterpreter.h>
-#include <lldb/API/SBCommandReturnObject.h>
+#include "lldb/API/SBEvent.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBBreakpoint.h"
+#include "lldb/API/SBStream.h"
+#include "lldb/API/SBThread.h"
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBCommandReturnObject.h"
 #ifdef _WIN32
 #include <io.h> // For the ::_access()
 #else
diff --git a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
index a4f36b400fa..5884abc6b8f 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
+++ b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.cpp
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 // Third Party Headers:
-#include <lldb/API/SBError.h>
+#include "lldb/API/SBError.h"
 
 // In-house headers:
 #include "MICmnLLDBProxySBValue.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.h b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.h
index e21eb95a2dd..39befe9566f 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBProxySBValue.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // Third Party Headers:
-#include <lldb/API/SBValue.h>
+#include "lldb/API/SBValue.h"
 
 // In-house headers:
 #include "MIDataTypes.h"
diff --git a/lldb/tools/lldb-mi/MICmnLLDBUtilSBValue.h b/lldb/tools/lldb-mi/MICmnLLDBUtilSBValue.h
index 1aa3022960b..a3f2c9c0ffc 100644
--- a/lldb/tools/lldb-mi/MICmnLLDBUtilSBValue.h
+++ b/lldb/tools/lldb-mi/MICmnLLDBUtilSBValue.h
@@ -22,7 +22,7 @@
 #pragma once
 
 // Third Party Headers:
-#include <lldb/API/SBValue.h>
+#include "lldb/API/SBValue.h"
 
 // In-house headers:
 #include "MIDataTypes.h"
diff --git a/lldb/tools/lldb-mi/MIDriver.cpp b/lldb/tools/lldb-mi/MIDriver.cpp
index accde1c7cde..7b19f15593f 100644
--- a/lldb/tools/lldb-mi/MIDriver.cpp
+++ b/lldb/tools/lldb-mi/MIDriver.cpp
@@ -22,7 +22,7 @@
 // Third party headers:
 #include <stdarg.h> // va_list, va_start, var_end
 #include <iostream>
-#include <lldb/API/SBError.h>
+#include "lldb/API/SBError.h"
 
 // In-house headers:
 #include "Driver.h"
diff --git a/lldb/tools/lldb-mi/MIDriverBase.cpp b/lldb/tools/lldb-mi/MIDriverBase.cpp
index fd9fae82119..fd1a0eca553 100644
--- a/lldb/tools/lldb-mi/MIDriverBase.cpp
+++ b/lldb/tools/lldb-mi/MIDriverBase.cpp
@@ -20,8 +20,8 @@
 //--
 
 // Third party headers:
-#include <lldb/API/SBEvent.h>
-#include <lldb/API/SBBroadcaster.h>
+#include "lldb/API/SBEvent.h"
+#include "lldb/API/SBBroadcaster.h"
 
 // In-house headers:
 #include "MIDriverBase.h"
diff --git a/lldb/tools/lldb-mi/MIDriverBase.h b/lldb/tools/lldb-mi/MIDriverBase.h
index 7516efd13b7..25ac2388728 100644
--- a/lldb/tools/lldb-mi/MIDriverBase.h
+++ b/lldb/tools/lldb-mi/MIDriverBase.h
@@ -22,8 +22,8 @@
 #pragma once
 
 // Third party headers:
-#include <lldb/API/SBDebugger.h>
-#include <lldb/API/SBBroadcaster.h>
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBBroadcaster.h"
 
 // In-house headers:
 #include "MIUtilString.h"
diff --git a/lldb/tools/lldb-mi/MIDriverMain.cpp b/lldb/tools/lldb-mi/MIDriverMain.cpp
index b14fb815b6e..526cb0c57e6 100644
--- a/lldb/tools/lldb-mi/MIDriverMain.cpp
+++ b/lldb/tools/lldb-mi/MIDriverMain.cpp
@@ -49,7 +49,7 @@
 
 // Third party headers:
 #include <stdio.h>
-#include <lldb/API/SBHostOS.h>
+#include "lldb/API/SBHostOS.h"
 
 // In house headers:
 #include "MICmnConfig.h"
diff --git a/lldb/tools/lldb-mi/MIDriverMgr.cpp b/lldb/tools/lldb-mi/MIDriverMgr.cpp
index 79b44ca947a..a1bdce70a43 100644
--- a/lldb/tools/lldb-mi/MIDriverMgr.cpp
+++ b/lldb/tools/lldb-mi/MIDriverMgr.cpp
@@ -20,7 +20,7 @@
 //--
 
 // Third Party Headers:
-#include <lldb/API/SBError.h>
+#include "lldb/API/SBError.h"
 
 // In-house headers:
 #include "MIDriverMgr.h"
diff --git a/lldb/tools/lldb-mi/MIDriverMgr.h b/lldb/tools/lldb-mi/MIDriverMgr.h
index d9449277b06..9e1e121405c 100644
--- a/lldb/tools/lldb-mi/MIDriverMgr.h
+++ b/lldb/tools/lldb-mi/MIDriverMgr.h
@@ -23,7 +23,7 @@
 
 // Third party headers:
 #include <map>
-#include <lldb/API/SBDebugger.h>
+#include "lldb/API/SBDebugger.h"
 
 // In-house headers:
 #include "MICmnBase.h"