forked from OSchip/llvm-project
build: fix libxml2 detection via CMake
libxml2's include path was unconditionally set to /usr/include/libxml2. This would work previously, however, Mavericks removed the /usr/include directory. Since LLDB already requires clang, which via LLVM's build infrastructure searches for libxml2, we have a proper include path for libxml2. If LIBXML2_FOUND is set, do not touch the libxml2 search path. Instead, allow the clang's definition to propagate throughout the LLVM build. Otherwise, switch to find_package(LibXml2) as clang does. This will ensure that the correct path is used for libxml2 irrespective of the platform. Furthermore, treat libxml2 as a system provided library. It is not part of the LLVM source base so it is of little value to enable all warnings on its headers. This unifies the treatment of libxml2 across clang and LLDB. llvm-svn: 203955
This commit is contained in:
parent
6efab6eed7
commit
eb4592b18d
|
@ -260,7 +260,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
|||
find_library(SECURITY_LIBRARY Security)
|
||||
find_library(DEBUG_SYMBOLS_LIBRARY DebugSymbols PATHS "/System/Library/PrivateFrameworks")
|
||||
|
||||
set(LIBXML2_INCLUDE_DIR "/usr/include/libxml2")
|
||||
if (NOT LIBXML2_FOUND)
|
||||
find_package(LibXml2)
|
||||
endif ()
|
||||
list(APPEND system_libs xml2 ncurses panel)
|
||||
list(APPEND system_libs ${CARBON_LIBRARY} ${FOUNDATION_LIBRARY}
|
||||
${CORE_FOUNDATION_LIBRARY} ${CORE_SERVICES_LIBRARY} ${SECURITY_LIBRARY}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
set(LLVM_NO_RTTI 1)
|
||||
|
||||
include_directories(${LIBXML2_INCLUDE_DIR})
|
||||
include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
|
||||
|
||||
add_lldb_library(lldbHostMacOSX
|
||||
Host.mm
|
||||
|
|
Loading…
Reference in New Issue