[llvm-commits] [llvm] r159593 - in /llvm/trunk: cmake/modules/AddLLVM.cmake test/CMakeLists.txt

[Chandler Carruth]

Author: chandlerc
Date: Mon Jul  2 16:31:03 2012
New Revision: 159593

URL: http://llvm.org/viewvc/llvm-project?rev=159593&view=rev
Log:
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.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/test/CMakeLists.txt

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=159593&r1=159592&r2=159593&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Mon Jul  2 16:31:03 2012
@@ -270,8 +270,13 @@
   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.

Modified: llvm/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=159593&r1=159592&r2=159593&view=diff
==============================================================================
--- llvm/trunk/test/CMakeLists.txt (original)
+++ llvm/trunk/test/CMakeLists.txt Mon Jul  2 16:31:03 2012
@@ -11,16 +11,14 @@
   ${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.