RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-04 17:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Temporarily revert "build: avoid hardcoding the libxml2 library name""

Browse Source 
This reverts commit 2e75681b55ab55301022533b203269f5f3d6f909.  Restore
the clean up change.  The underlying CMake issue was resolved in
372ad32734ecb455f9fb4d0601229ca2dfc78b66.
This commit is contained in:
Saleem Abdulrasool 2019-12-03 09:27:14 -08:00
parent a6f23567d6
commit 8ce907a855
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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()

18
lib/WindowsManifest/CMakeLists.txt
View File

@ -1,18 +1,12 @@
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
ADDITIONAL_HEADER_DIRS
${LLVM_MAIN_INCLUDE_DIR}/llvm/WindowsManifest
${Backtrace_INCLUDE_DIRS}
${Backtrace_INCLUDE_DIRS})
LINK_LIBS ${system_libs}
)
set_property(TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS "${system_libs}")
if(LIBXML2_LIBRARIES)
target_link_libraries(LLVMWindowsManifest PUBLIC ${LIBXML2_LIBRARIES})
set_property(TARGET LLVMWindowsManifest PROPERTY
LLVM_SYSTEM_LIBS ${LIBXML2_LIBRARIES})
endif()