[Lldb-commits] [lldb] r230398 - [CMake] Clean up lldb-mi CMakeLists.txt.

[Zachary Turner]

Author: zturner
Date: Tue Feb 24 17:36:12 2015
New Revision: 230398

URL: http://llvm.org/viewvc/llvm-project?rev=230398&view=rev
Log:
[CMake] Clean up lldb-mi CMakeLists.txt.

It was maintaining two huge file lists that are identical except
for 1 file.  Make this work the proper way.

Modified:
    lldb/trunk/CMakeLists.txt
    lldb/trunk/tools/lldb-mi/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=230398&r1=230397&r2=230398&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Tue Feb 24 17:36:12 2015
@@ -24,6 +24,9 @@ endif ()
 set(LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION ${LLDB_DEFAULT_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION} CACHE BOOL
   "Enables using new Python scripts for SWIG API generation .")  
 
+set(LLDB_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/source")
+set(LLDB_INCLUDE_ROOT "${LLDB_INCLUDE_ROOT}/include")
+
 # If we are not building as a part of LLVM, build LLDB as an
 # standalone project, using LLVM as an external library:
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

Modified: lldb/trunk/tools/lldb-mi/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/CMakeLists.txt?rev=230398&r1=230397&r2=230398&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/CMakeLists.txt (original)
+++ lldb/trunk/tools/lldb-mi/CMakeLists.txt Tue Feb 24 17:36:12 2015
@@ -1,169 +1,94 @@
 set(LLVM_NO_RTTI 1)
+
+set(LLDB_MI_SOURCES
+  Driver.cpp
+  MICmdArgContext.cpp
+  MICmdArgSet.cpp
+  MICmdArgValBase.cpp
+  MICmdArgValConsume.cpp
+  MICmdArgValFile.cpp
+  MICmdArgValListBase.cpp
+  MICmdArgValListOfN.cpp
+  MICmdArgValNumber.cpp
+  MICmdArgValOptionLong.cpp
+  MICmdArgValOptionShort.cpp
+  MICmdArgValString.cpp
+  MICmdArgValThreadGrp.cpp
+  MICmdBase.cpp
+  MICmdCommands.cpp
+  MICmdCmd.cpp
+  MICmdCmdBreak.cpp
+  MICmdCmdData.cpp
+  MICmdCmdEnviro.cpp
+  MICmdCmdExec.cpp
+  MICmdCmdFile.cpp
+  MICmdCmdGdbInfo.cpp
+  MICmdCmdGdbSet.cpp
+  MICmdCmdGdbThread.cpp
+  MICmdCmdMiscellanous.cpp
+  MICmdCmdStack.cpp
+  MICmdCmdSupportInfo.cpp
+  MICmdCmdSupportList.cpp
+  MICmdCmdSymbol.cpp
+  MICmdCmdTarget.cpp
+  MICmdCmdThread.cpp
+  MICmdCmdTrace.cpp
+  MICmdCmdVar.cpp
+  MICmdData.cpp
+  MICmdFactory.cpp
+  MICmdInterpreter.cpp
+  MICmdInvoker.cpp
+  MICmdMgr.cpp
+  MICmdMgrSetCmdDeleteCallback.cpp
+  MICmnBase.cpp
+  MICmnLLDBBroadcaster.cpp
+  MICmnLLDBDebugger.cpp
+  MICmnLLDBDebuggerHandleEvents.cpp
+  MICmnLLDBDebugSessionInfo.cpp
+  MICmnLLDBDebugSessionInfoVarObj.cpp
+  MICmnLLDBProxySBValue.cpp
+  MICmnLLDBUtilSBValue.cpp
+  MICmnLog.cpp
+  MICmnLogMediumFile.cpp
+  MICmnMIOutOfBandRecord.cpp
+  MICmnMIResultRecord.cpp
+  MICmnMIValue.cpp
+  MICmnMIValueConst.cpp
+  MICmnMIValueList.cpp
+  MICmnMIValueResult.cpp
+  MICmnMIValueTuple.cpp
+  MICmnResources.cpp
+  MICmnStreamStderr.cpp
+  MICmnStreamStdin.cpp
+  MICmnStreamStdout.cpp
+  MICmnThreadMgrStd.cpp
+  MIDriver.cpp
+  MIDriverBase.cpp
+  MIDriverMain.cpp
+  MIDriverMgr.cpp
+  MIUtilDateTimeStd.cpp
+  MIUtilDebug.cpp
+  MIUtilFileStd.cpp
+  MIUtilMapIdToVariant.cpp
+  MIUtilString.cpp
+  MIUtilSystemLinux.cpp
+  MIUtilSystemOsx.cpp
+  MIUtilSystemWindows.cpp
+  MIUtilTermios.cpp
+  MIUtilThreadBaseStd.cpp
+  MIUtilVariant.cpp
+  Platform.cpp
+  )
+
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
   add_definitions( -DIMPORT_LIBLLDB )
-
-  add_lldb_executable(lldb-mi
-    Driver.cpp
-    ../../source/Host/windows/getopt/GetOptInc.cpp
-    MICmdArgContext.cpp
-    MICmdArgSet.cpp
-    MICmdArgValBase.cpp
-    MICmdArgValConsume.cpp
-    MICmdArgValFile.cpp
-    MICmdArgValListBase.cpp
-    MICmdArgValListOfN.cpp
-    MICmdArgValNumber.cpp
-    MICmdArgValOptionLong.cpp
-    MICmdArgValOptionShort.cpp
-    MICmdArgValString.cpp
-    MICmdArgValThreadGrp.cpp
-    MICmdBase.cpp
-    MICmdCommands.cpp
-    MICmdCmd.cpp
-    MICmdCmdBreak.cpp
-    MICmdCmdData.cpp
-    MICmdCmdEnviro.cpp
-    MICmdCmdExec.cpp
-    MICmdCmdFile.cpp
-    MICmdCmdGdbInfo.cpp
-    MICmdCmdGdbSet.cpp
-    MICmdCmdGdbThread.cpp
-    MICmdCmdMiscellanous.cpp
-    MICmdCmdStack.cpp
-    MICmdCmdSupportInfo.cpp
-    MICmdCmdSupportList.cpp
-    MICmdCmdSymbol.cpp
-    MICmdCmdTarget.cpp
-    MICmdCmdThread.cpp
-    MICmdCmdTrace.cpp
-    MICmdCmdVar.cpp
-    MICmdData.cpp
-    MICmdFactory.cpp
-    MICmdInterpreter.cpp
-    MICmdInvoker.cpp
-    MICmdMgr.cpp
-    MICmdMgrSetCmdDeleteCallback.cpp
-    MICmnBase.cpp
-    MICmnLLDBBroadcaster.cpp
-    MICmnLLDBDebugger.cpp
-    MICmnLLDBDebuggerHandleEvents.cpp
-    MICmnLLDBDebugSessionInfo.cpp
-    MICmnLLDBDebugSessionInfoVarObj.cpp
-    MICmnLLDBProxySBValue.cpp
-    MICmnLLDBUtilSBValue.cpp
-    MICmnLog.cpp
-    MICmnLogMediumFile.cpp
-    MICmnMIOutOfBandRecord.cpp
-    MICmnMIResultRecord.cpp
-    MICmnMIValue.cpp
-    MICmnMIValueConst.cpp
-    MICmnMIValueList.cpp
-    MICmnMIValueResult.cpp
-    MICmnMIValueTuple.cpp
-    MICmnResources.cpp
-    MICmnStreamStderr.cpp
-    MICmnStreamStdin.cpp
-    MICmnStreamStdout.cpp
-    MICmnThreadMgrStd.cpp
-    MIDriver.cpp
-    MIDriverBase.cpp
-    MIDriverMain.cpp
-    MIDriverMgr.cpp
-    MIUtilDateTimeStd.cpp
-    MIUtilDebug.cpp
-    MIUtilFileStd.cpp
-    MIUtilMapIdToVariant.cpp
-    MIUtilString.cpp
-    MIUtilSystemLinux.cpp
-    MIUtilSystemOsx.cpp
-    MIUtilSystemWindows.cpp
-    MIUtilTermios.cpp
-    MIUtilThreadBaseStd.cpp
-    MIUtilVariant.cpp
-    Platform.cpp
-    )
-else ()
-  add_lldb_executable(lldb-mi
-    Driver.cpp
-    MICmdArgContext.cpp
-    MICmdArgSet.cpp
-    MICmdArgValBase.cpp
-    MICmdArgValConsume.cpp
-    MICmdArgValFile.cpp
-    MICmdArgValListBase.cpp
-    MICmdArgValListOfN.cpp
-    MICmdArgValNumber.cpp
-    MICmdArgValOptionLong.cpp
-    MICmdArgValOptionShort.cpp
-    MICmdArgValString.cpp
-    MICmdArgValThreadGrp.cpp
-    MICmdBase.cpp
-    MICmdCommands.cpp
-    MICmdCmd.cpp
-    MICmdCmdBreak.cpp
-    MICmdCmdData.cpp
-    MICmdCmdEnviro.cpp
-    MICmdCmdExec.cpp
-    MICmdCmdFile.cpp
-    MICmdCmdGdbInfo.cpp
-    MICmdCmdGdbSet.cpp
-    MICmdCmdGdbThread.cpp
-    MICmdCmdMiscellanous.cpp
-    MICmdCmdStack.cpp
-    MICmdCmdSupportInfo.cpp
-    MICmdCmdSupportList.cpp
-    MICmdCmdSymbol.cpp
-    MICmdCmdTarget.cpp
-    MICmdCmdThread.cpp
-    MICmdCmdTrace.cpp
-    MICmdCmdVar.cpp
-    MICmdData.cpp
-    MICmdFactory.cpp
-    MICmdInterpreter.cpp
-    MICmdInvoker.cpp
-    MICmdMgr.cpp
-    MICmdMgrSetCmdDeleteCallback.cpp
-    MICmnBase.cpp
-    MICmnLLDBBroadcaster.cpp
-    MICmnLLDBDebugger.cpp
-    MICmnLLDBDebuggerHandleEvents.cpp
-    MICmnLLDBDebugSessionInfo.cpp
-    MICmnLLDBDebugSessionInfoVarObj.cpp
-    MICmnLLDBProxySBValue.cpp
-    MICmnLLDBUtilSBValue.cpp
-    MICmnLog.cpp
-    MICmnLogMediumFile.cpp
-    MICmnMIOutOfBandRecord.cpp
-    MICmnMIResultRecord.cpp
-    MICmnMIValue.cpp
-    MICmnMIValueConst.cpp
-    MICmnMIValueList.cpp
-    MICmnMIValueResult.cpp
-    MICmnMIValueTuple.cpp
-    MICmnResources.cpp
-    MICmnStreamStderr.cpp
-    MICmnStreamStdin.cpp
-    MICmnStreamStdout.cpp
-    MICmnThreadMgrStd.cpp
-    MIDriver.cpp
-    MIDriverBase.cpp
-    MIDriverMain.cpp
-    MIDriverMgr.cpp
-    MIUtilDateTimeStd.cpp
-    MIUtilDebug.cpp
-    MIUtilFileStd.cpp
-    MIUtilMapIdToVariant.cpp
-    MIUtilString.cpp
-    MIUtilSystemLinux.cpp
-    MIUtilSystemOsx.cpp
-    MIUtilSystemWindows.cpp
-    MIUtilTermios.cpp
-    MIUtilThreadBaseStd.cpp
-    MIUtilVariant.cpp
-    Platform.cpp
+  list(APPEND LLDB_MI_SOURCES
+    ${LLDB_SOURCE_ROOT}/Host/windows/getopt/GetOptInc.cpp
     )
 endif ()
 
+add_lldb_executable(lldb-mi ${LLDB_MI_SOURCES})
+
 target_link_libraries(lldb-mi liblldb)
 if ( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
   target_link_libraries(lldb-mi pthread)