build/cmake: Switch to using llvm-build computed dependencies.

- I verified locally that the current dependency lists are identical.
 - This makes add_llvm_library_dependencies() a no-op. I'll remove it once this
   change passes the bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145355 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2011-11-29 01:31:52 +00:00
parent ba78c883d4
commit 288bc5cdd0
3 changed files with 11 additions and 9 deletions

View File

@ -25,15 +25,17 @@ macro(add_llvm_library name)
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
endif() endif()
set_target_properties(${name} PROPERTIES FOLDER "Libraries") set_target_properties(${name} PROPERTIES FOLDER "Libraries")
# Add the explicit dependency information for this library.
#
# It would be nice to verify that we have the dependencies for this library
# name, but using get_property(... SET) doesn't suffice to determine if a
# property has been set to an empty value.
get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name})
target_link_libraries(${name} ${lib_deps})
endmacro(add_llvm_library name) endmacro(add_llvm_library name)
macro(add_llvm_library_dependencies name) macro(add_llvm_library_dependencies name)
# Save the dependencies of the LLVM library in a variable so that we can
# query it when resolve llvm-config-style component -> library mappings.
set_property(GLOBAL PROPERTY LLVM_LIB_DEPS_${name} ${ARGN})
# Then add the actual dependencies to the library target.
target_link_libraries(${name} ${ARGN})
endmacro(add_llvm_library_dependencies name) endmacro(add_llvm_library_dependencies name)
macro(add_llvm_loadable_module name) macro(add_llvm_loadable_module name)

View File

@ -4,9 +4,9 @@ set(LLVM_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
get_property(llvm_libs GLOBAL PROPERTY LLVM_LIBS) get_property(llvm_libs GLOBAL PROPERTY LLVM_LIBS)
foreach(lib ${llvm_libs}) foreach(lib ${llvm_libs})
get_property(llvm_lib_deps GLOBAL PROPERTY LLVM_LIB_DEPS_${lib}) get_property(llvm_lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${lib})
set(all_llvm_lib_deps set(all_llvm_lib_deps
"${all_llvm_lib_deps}\nset_property(GLOBAL PROPERTY LLVM_LIB_DEPS_${lib} ${llvm_lib_deps})") "${all_llvm_lib_deps}\nset_property(GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${lib} ${llvm_lib_deps})")
endforeach(lib) endforeach(lib)
configure_file( configure_file(

View File

@ -152,7 +152,7 @@ function(explicit_map_components_to_libraries out_libs)
set(processed) set(processed)
while( cursor LESS lst_size ) while( cursor LESS lst_size )
list(GET expanded_components ${cursor} lib) list(GET expanded_components ${cursor} lib)
get_property(lib_deps GLOBAL PROPERTY LLVM_LIB_DEPS_${lib}) get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${lib})
list(APPEND expanded_components ${lib_deps}) list(APPEND expanded_components ${lib_deps})
# Remove duplicates at the front: # Remove duplicates at the front:
list(REVERSE expanded_components) list(REVERSE expanded_components)