summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2018-03-09 14:46:44 +0000
committerHans Wennborg <hans@hanshq.net>2018-03-09 14:46:44 +0000
commit14b7e1890916c3941153b373e007fd4ce2fecf85 (patch)
treefa7ce2219cb36c4dcbe4fba9adb585b90a03c606
parent1a1dffd27585fc97c22acae9628c781060a7afc8 (diff)
downloadbcm5719-llvm-14b7e1890916c3941153b373e007fd4ce2fecf85.tar.gz
bcm5719-llvm-14b7e1890916c3941153b373e007fd4ce2fecf85.zip
CMake: Make libxml2 show up in --system-libs (PR36660)
lib/WindowsManifest/CMakeLists.txt adds it to LLVM_SYSTEM_LIBS on that target, but it was never getting picked up in tools/llvm-config/CMakeLists.txt. Differential Revision: https://reviews.llvm.org/D44302 llvm-svn: 327135
-rw-r--r--llvm/tools/llvm-config/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt
index d7bebfc6ffa..f59402ac4b0 100644
--- a/llvm/tools/llvm-config/CMakeLists.txt
+++ b/llvm/tools/llvm-config/CMakeLists.txt
@@ -9,8 +9,9 @@ add_llvm_tool(llvm-config
)
# Compute the substitution values for various items.
-get_property(LLVM_SYSTEM_LIBS_LIST TARGET LLVMSupport PROPERTY LLVM_SYSTEM_LIBS)
-foreach(l ${LLVM_SYSTEM_LIBS_LIST})
+get_property(SUPPORT_SYSTEM_LIBS TARGET LLVMSupport PROPERTY LLVM_SYSTEM_LIBS)
+get_property(WINDOWSMANIFEST_SYSTEM_LIBS TARGET LLVMWindowsManifest PROPERTY LLVM_SYSTEM_LIBS)
+foreach(l ${SUPPORT_SYSTEM_LIBS} ${WINDOWSMANIFEST_SYSTEM_LIBS})
if(MSVC)
set(SYSTEM_LIBS ${SYSTEM_LIBS} "${l}.lib")
else()
OpenPOWER on IntegriCloud