[llvm-commits] [llvm] r159588 - /llvm/trunk/test/CMakeLists.txt

Chandler Carruth chandlerc at gmail.com
Mon Jul 2 14:14:07 PDT 2012


Author: chandlerc
Date: Mon Jul  2 16:14:06 2012
New Revision: 159588

URL: http://llvm.org/viewvc/llvm-project?rev=159588&view=rev
Log:
Work around a really frustrating apparant CMake bug.

No functionality changed here, except that the CMake installed by
default on Ubuntu Lucid should actually work with the makefile
generators now.

Thanks to Matt for the report and head-desking required to figure out
why it was failing.

Modified:
    llvm/trunk/test/CMakeLists.txt

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





More information about the llvm-commits mailing list