maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] Fix add_lldb_test_dependency 

This function would ignore all but the first argument. Now it correctly
adds every dependency by iterating over its arguments.

llvm-svn: 374216
This commit is contained in:
Jonas Devlieghere 2019-10-09 20:36:29 +00:00
parent be1c290226
commit d61ef7c46d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/cmake/modules/AddLLDB.cmake
View File

@ -27,8 +27,10 @@ function(lldb_tablegen)
endif() endif()
endfunction(lldb_tablegen) endfunction(lldb_tablegen)
function(add_lldb_test_dependency name) function(add_lldb_test_dependency)
add_dependencies(lldb-test-deps ${name}) foreach(dependency ${ARGN})
add_dependencies(lldb-test-deps ${dependency})
endforeach()
endfunction(add_lldb_test_dependency) endfunction(add_lldb_test_dependency)
function(add_lldb_library name) function(add_lldb_library name)

16
lldb/test/CMakeLists.txt
View File

@ -70,6 +70,14 @@ else()
endif() endif()
endif() endif()
if(NOT LLDB_BUILT_STANDALONE)
add_lldb_test_dependency(
FileCheck
count
not
)
endif()
# the value is not canonicalized within LLVM # the value is not canonicalized within LLVM
llvm_canonicalize_cmake_booleans( llvm_canonicalize_cmake_booleans(
LLDB_DISABLE_PYTHON LLDB_DISABLE_PYTHON
@ -100,14 +108,6 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in ${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in
${CMAKE_CURRENT_BINARY_DIR}/Shell/lit-lldb-init) ${CMAKE_CURRENT_BINARY_DIR}/Shell/lit-lldb-init)
if(NOT LLDB_BUILT_STANDALONE)
add_lldb_test_dependency(
FileCheck
count
not
)
endif()
add_lit_testsuites(LLDB add_lit_testsuites(LLDB
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}