CMake: llvm_map_components_to_libraries now returns system libs too.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110563 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/cmake/modules/LLVM.cmake b/cmake/modules/LLVM.cmake
index 1f6327112811eba452ccce115b691906d3d04b54..b055d83f91893470a6bbae27554a610ec638ab6f 100644 (file)
--- a/cmake/modules/LLVM.cmake
+++ b/cmake/modules/LLVM.cmake
@@ -8,7 +8,7 @@ set(LLVM_TARGETS_TO_BUILD @LLVM_TARGETS_TO_BUILD@)
 
 set(LLVM_TOOLS_BINARY_DIR @LLVM_TOOLS_BINARY_DIR@)
 
-set(HAVE_LLVM_CONFIG @HAVE_LLVM_CONFIG@)
+set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)
 
 if( NOT EXISTS LLVMConfig.cmake )
   set(CMAKE_MODULE_PATH

diff --git a/cmake/modules/LLVMConfig.cmake b/cmake/modules/LLVMConfig.cmake
index 5c94b126b0d7aa21331afb970f398df8303ea62e..c623bfaba8d123aceecbf5d7d6cbf3e406232f29 100755 (executable)
--- a/cmake/modules/LLVMConfig.cmake
+++ b/cmake/modules/LLVMConfig.cmake
@@ -52,7 +52,8 @@ endfunction(explicit_llvm_config)
 # This is a variant intended for the final user:
 function(llvm_map_components_to_libraries OUT_VAR)
   explicit_map_components_to_libraries(result ${ARGN})
-  set( ${OUT_VAR} ${result} )
+  get_system_libs(sys_result)
+  set( ${OUT_VAR} ${result} ${sys_result} )
 endfunction(llvm_map_components_to_libraries)