maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

build: avoid hardcoding the libxml2 library name 

FindLibXml2 will set the LIBXML2_LIBRARIES variable to the libraries that
we must link against. This will be an empty string if libxml2 is not
found. Avoid hardcoding the library name as xml2 in the configuration.
Simplify the usage in the WindowsManifest library.
This commit is contained in:
Saleem Abdulrasool 2019-11-27 12:34:36 -08:00
parent dcceab1a0a
commit 340e7c0b77
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
llvm/cmake/config-ix.cmake
View File

@ -166,7 +166,6 @@ if(NOT LLVM_USE_SANITIZER MATCHES "Memory.*")
else()
include_directories(${LIBXML2_INCLUDE_DIR})
endif()
set(LIBXML2_LIBS "xml2")
endif()
endif()
endif()

12
llvm/lib/WindowsManifest/CMakeLists.txt
View File

@ -1,10 +1,3 @@
set(system_libs)
if( CMAKE_HOST_UNIX )
if( LLVM_LIBXML2_ENABLED )
set(system_libs ${system_libs} ${LIBXML2_LIBS})
endif()
endif()
add_llvm_component_library(LLVMWindowsManifest
WindowsManifestMerger.cpp
@ -12,7 +5,8 @@ add_llvm_component_library(LLVMWindowsManifest
${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest
${Backtrace_INCLUDE_DIRS}
LINK_LIBS ${system_libs}
LINK_LIBS ${LIBXML2_LIBRARIES}
)
set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS "${system_libs}")
set_property(TARGET LLVMWindowsManifest PROPERTY
LLVM_SYSTEM_LIBS ${LIBXML2_LIBRARIES})