Author: jdevlieghere
Date: Wed Oct 9 13:36:29 2019
New Revision: 374216
URL: http://llvm.org/viewvc/llvm-project?rev=374216&view=rev
Log:
[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.
Modified:
lldb/trunk/cmake/modules/AddLLDB.cmake
lldb/trunk/test/CMakeLists.txt
Modified: lldb/trunk/cmake/modules/AddLLDB.cmake
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=374216&r1=374215&r2=374216&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/AddLLDB.cmake (original)
+++ lldb/trunk/cmake/modules/AddLLDB.cmake Wed Oct 9 13:36:29 2019
@@ -27,8 +27,10 @@ function(lldb_tablegen)
endif()
endfunction(lldb_tablegen)
-function(add_lldb_test_dependency name)
- add_dependencies(lldb-test-deps ${name})
+function(add_lldb_test_dependency)
+ foreach(dependency ${ARGN})
+ add_dependencies(lldb-test-deps ${dependency})
+ endforeach()
endfunction(add_lldb_test_dependency)
function(add_lldb_library name)
Modified: lldb/trunk/test/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=374216&r1=374215&r2=374216&view=diff
==============================================================================
--- lldb/trunk/test/CMakeLists.txt (original)
+++ lldb/trunk/test/CMakeLists.txt Wed Oct 9 13:36:29 2019
@@ -70,6 +70,14 @@ else()
endif()
endif()
+if(NOT LLDB_BUILT_STANDALONE)
+ add_lldb_test_dependency(
+ FileCheck
+ count
+ not
+ )
+endif()
+
# the value is not canonicalized within LLVM
llvm_canonicalize_cmake_booleans(
LLDB_DISABLE_PYTHON
@@ -100,14 +108,6 @@ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/Shell/lit-lldb-init.in
${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
${CMAKE_CURRENT_SOURCE_DIR}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
