Commit fbb8ee3f authored by Bill Wendling's avatar Bill Wendling
Browse files

Merge revisions r181919:183444 except for r182099, r182650, and r182683. 

llvm-svn: 184287
parent 7b2952d3

lldb/.arcconfig

0 → 100644
+4 −0
Original line number Diff line number Diff line 
{

  "project_id" : "lldb",

  "conduit_uri" : "http://llvm-reviews.chandlerc.com/"

}

lldb/CMakeLists.txt

+12 −1
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) 
"`CMakeFiles'. Please delete them.")

endif()



# Compute the LLDB version from the LLVM version.

string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" LLDB_VERSION

  ${PACKAGE_VERSION})

message(STATUS "LLDB version: ${LLDB_VERSION}")



macro(add_lldb_library name)

  llvm_process_sources(srcs ${ARGN})

  if (MSVC_IDE OR XCODE)
@@ -170,7 +175,7 @@ macro(add_lldb_library name) 
  #endif()



  if(LLDB_USED_LIBS)

    if (CMAKE_SYSTEM_NAME MATCHES "Linux")

    if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

      target_link_libraries(${name} -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)

    else()

      target_link_libraries(${name} ${LLDB_USED_LIBS})
@@ -241,7 +246,13 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") 
  ${DEBUG_SYMBOLS_LIBRARY})

endif()



# On FreeBSD, link libexecinfo because libc is missing  backtrace()

if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

  list(APPEND system_libs execinfo)

endif()



#add_subdirectory(include)

add_subdirectory(docs)

add_subdirectory(scripts)

add_subdirectory(source)

add_subdirectory(test)

lldb/docs/CMakeLists.txt

0 → 100644
+41 −0
Original line number Diff line number Diff line 


include(FindDoxygen)



if(DOXYGEN_FOUND)

  set(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR}/..)

  set(DOT dot)

  set(PACKAGE_VERSION mainline)

  set(abs_top_builddir ..)

  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxygen.cfg.in

  ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg @ONLY)



  add_custom_target(lldb-cpp-doc

    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg

    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

    COMMENT "Generating LLDB C++ API reference with Doxygen" VERBATIM

  )

endif(DOXYGEN_FOUND)



find_package(PythonInterp REQUIRED)

find_program(EPYDOC_EXECUTABLE NAMES epydoc epydoc.py)

if(EPYDOC_EXECUTABLE)

  find_program(DOT_EXECUTABLE dot)

    if(DOT_EXECUTABLE)

      set(EPYDOC_OPTIONS ${EPYDOC_OPTIONS} --graph all --dotpath ${DOT_EXECUTABLE})

    endif()

    set(DOC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc")

    file(MAKE_DIRECTORY "${DOC_DIR}")

    #set(ENV{PYTHONPATH} ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/python2.7/site-packages)

    add_custom_target(lldb-python-doc

      ${EPYDOC_EXECUTABLE}

      --html

      lldb

      -o ${CMAKE_CURRENT_BINARY_DIR}/python_reference

      --name "LLDB python API"

      --url "http://lldb.llvm.org"

      ${EPYDOC_OPTIONS}

      DEPENDS swig_wrapper liblldb

      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../lib/python2.7/site-packages

      COMMENT "Generating LLDB Python API reference with epidoc" VERBATIM

    )

endif(EPYDOC_EXECUTABLE)

lldb/docs/doxygen.cfg.in

0 → 100644
+1633 −0

File added.

Preview size limit exceeded, changes collapsed.

lldb/docs/doxygen.footer

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<hr>

<p class="footer">

Generated on $datetime for <a href="http://lldb.llvm.org/">$projectname</a> by

<a href="http://www.doxygen.org"><img src="doxygen.png" alt="Doxygen"

align="middle" border="0"/>$doxygenversion</a><br>

Copyright &copy; 2003-2013 University of Illinois at Urbana-Champaign.

All Rights Reserved.</p>



<hr>

<!--#include virtual="/attrib.incl" -->



</body>

</html>