Skip to content

Commit e57d375

Browse files
committed
build: do not assume that XML2 should be enabled
Allow user control over libxml2 usage via `LLVM_ENABLE_LIBXML2` rather than assuming that if it is found, it should be enabled.
1 parent 16c9c00 commit e57d375

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ foreach(SDK ${SWIFT_SDKS})
218218
set(validation_test_bin_dir
219219
"${CMAKE_CURRENT_BINARY_DIR}/../validation-test${VARIANT_SUFFIX}")
220220

221-
if(LibXml2_FOUND)
221+
if(LLVM_ENABLE_LIBXML2)
222222
set(SWIFT_HAVE_LIBXML2 TRUE)
223223
else()
224224
set(SWIFT_HAVE_LIBXML2 FALSE)

tools/swift-ide-test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ target_link_libraries(swift-ide-test
1212
swiftIDE)
1313

1414
# If libxml2 is available, make it available for swift-ide-test.
15-
if(LibXml2_FOUND)
15+
if(LLVM_ENABLE_LIBXML2)
1616
include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
1717
target_link_libraries(swift-ide-test PRIVATE ${LIBXML2_LIBRARIES})
1818
target_compile_definitions(swift-ide-test PRIVATE SWIFT_HAVE_LIBXML=1)

0 commit comments

Comments
 (0)