[llvm-branch-commits] [llvm-branch] r329482 - Merging r327135:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri Apr  6 21:27:52 2018
New Revision: 329482

URL: http://llvm.org/viewvc/llvm-project?rev=329482&view=rev
Log:
Merging r327135:

------------------------------------------------------------------------
r327135 | hans | 2018-03-09 06:46:44 -0800 (Fri, 09 Mar 2018) | 7 lines

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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_60/tools/llvm-config/CMakeLists.txt

Modified: llvm/branches/release_60/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/tools/llvm-config/CMakeLists.txt?rev=329482&r1=329481&r2=329482&view=diff
==============================================================================
--- llvm/branches/release_60/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/branches/release_60/tools/llvm-config/CMakeLists.txt Fri Apr  6 21:27:52 2018
@@ -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()