Revert r159588, and apply a more principled fix. Place the fix for this

in the abstraction for lit test suites so that the various other layers
of abstraction pick up the same behavioral fix, and so that we still get
a complete list of dependencies for the 'check-all' target.

This should fix the follow-on issues of the same nature with various
other build targets, including Clang targets. Sorry for the churn, and
again thanks to Matt for testing and breaking this more thoroughly.

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

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index 78a21ada84a42d3271b24bf01e8030e9c2acd67b..b5b74f0f160ffe40c5a5239cfd0b18ba66299b96 100755 (executable)
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -270,8 +270,13 @@ function(add_lit_target target comment)
   add_custom_target(${target}
     COMMAND ${LIT_COMMAND} ${ARG_DEFAULT_ARGS}
     COMMENT "${comment}"
-    DEPENDS ${ARG_DEPENDS}
     )
+
+  # It would be nice to use the DEPENDS clause in add_custom_target above, but
+  # that has bugs with the CMake 2.8.0 installed on Ubuntu Lucid when the entry
+  # in the depends is another custom target. Instead we add them through an
+  # explicit add_dependencies.
+  add_dependencies(${target} ${ARG_DEPENDS})
 endfunction()
 
 # A function to add a set of lit test suites to be driven through 'check-*' targets.

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ea7b7ab2d4b04f15a199e67bcfb7276804a0a2a1..651d0243f14a9b9ca40aecb2360305f6544f3fbe 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,16 +11,14 @@ add_lit_testsuite(check-llvm "Running the LLVM regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   PARAMS llvm_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
          llvm_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg
-  DEPENDS BugpointPasses LLVMHello
+  DEPENDS UnitTests
+          BugpointPasses LLVMHello
           llc lli llvm-ar llvm-as llvm-dis llvm-extract llvm-dwarfdump
           llvm-link llvm-mc llvm-nm llvm-objdump llvm-readobj
           macho-dump opt
           FileCheck count not
   )
 set_target_properties(check-llvm PROPERTIES FOLDER "Tests")
-# Note, this is kept here rather than in the DEPENDS above because of bugs in
-# some CMake versions that mishandle the dependency otherwise.
-add_dependencies(check-llvm UnitTests)
 
 # Setup a legacy alias for 'check-llvm'. This will likely change to be an
 # alias for 'check-all' at some point in the future.