mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-26 21:00:29 +00:00
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. llvm-svn: 145355
This commit is contained in:
parent
1d55ba306b
commit
7815841fb4
@ -25,15 +25,17 @@ macro(add_llvm_library name)
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
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)
|
||||
|
||||
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)
|
||||
|
||||
macro(add_llvm_loadable_module name)
|
||||
|
@ -4,9 +4,9 @@ set(LLVM_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
|
||||
get_property(llvm_libs GLOBAL PROPERTY 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
|
||||
"${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)
|
||||
|
||||
configure_file(
|
||||
|
@ -152,7 +152,7 @@ function(explicit_map_components_to_libraries out_libs)
|
||||
set(processed)
|
||||
while( cursor LESS lst_size )
|
||||
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})
|
||||
# Remove duplicates at the front:
|
||||
list(REVERSE expanded_components)
|
||||
|
Loading…
Reference in New Issue
Block a user