diff options
| -rwxr-xr-x | cmake/modules/AddLLVM.cmake | 7 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index 78a21ada84..b5b74f0f16 100755 --- 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 ea7b7ab2d4..651d0243f1 100644 --- 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. |