Author: zturner
Date: Mon Oct 19 12:34:51 2015
New Revision: 250709
URL: http://llvm.org/viewvc/llvm-project?rev=250709&view=rev
Log:
Disable libxml2 on Windows for now.
Newer versions of CMake include a "smarter" FindLibxml2 package.
In theory this is a good thing, but on Windows it's now smart
enough to find the version that comes with Gnuwin32, which doesn't
appear to be a valid libxml2 distribution. Or at the very least,
LLDB currently uses some header files from libxml2 that are not
part of this distribution.
Nobody on Windows is using any of this functionality right now
anyway, so just disable it.
Modified:
lldb/trunk/cmake/modules/LLDBConfig.cmake
Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=250709&r1=250708&r2=250709&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Mon Oct 19 12:34:51 2015
@@ -281,7 +281,11 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
)
endif()
-if (NOT LIBXML2_FOUND)
+if (NOT LIBXML2_FOUND AND NOT (CMAKE_SYSTEM_NAME MATCHES "Windows"))
+ # Skip Libxml2 on Windows. In CMake 3.4 and higher, the algorithm for
+ # finding libxml2 got "smarter", and it can now locate the version which is
+ # in gnuwin32, even though that version does not contain the headers that
+ # LLDB uses.
find_package(LibXml2)
endif()
@@ -301,7 +305,6 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
${DEBUG_SYMBOLS_LIBRARY})
else()
-
if (LIBXML2_FOUND)
add_definitions( -DLIBXML2_DEFINED )
list(APPEND system_libs ${LIBXML2_LIBRARIES})
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
