diff options
| author | Hans Wennborg <hans@hanshq.net> | 2019-01-29 13:32:41 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2019-01-29 13:32:41 +0000 |
| commit | caadcebad0ee115a689c8b000e59f73d85af84c9 (patch) | |
| tree | c20af74de4ce3bbe5bddeb69e1235db973a0d438 | |
| parent | 53ba53bed4e52c9b49297bce06c61e4cb4006b51 (diff) | |
| download | llvm-caadcebad0ee115a689c8b000e59f73d85af84c9.zip llvm-caadcebad0ee115a689c8b000e59f73d85af84c9.tar.gz llvm-caadcebad0ee115a689c8b000e59f73d85af84c9.tar.bz2 | |
Merging r352382:
------------------------------------------------------------------------
r352382 | stefan.graenitz | 2019-01-28 17:15:27 +0100 (Mon, 28 Jan 2019) | 5 lines
[CMake] Quick-Fix targets don't exist when building against LLVM install-tree with LLDB_INCLUDE_TESTS=ON
The issue came up during release testing for LLVM 8: https://bugs.llvm.org/show_bug.cgi?id=40443
Differential Revision: https://reviews.llvm.org/D57233
------------------------------------------------------------------------
llvm-svn: 352491
| -rw-r--r-- | lldb/cmake/modules/AddLLDB.cmake | 4 | ||||
| -rw-r--r-- | lldb/lit/CMakeLists.txt | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index f7cac3d..f82c11d 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -88,7 +88,9 @@ function(add_lldb_library name) # Hack: only some LLDB libraries depend on the clang autogenerated headers, # but it is simple enough to make all of LLDB depend on some of those # headers without negatively impacting much of anything. - add_dependencies(${name} clang-tablegen-targets) + if(NOT LLDB_BUILT_STANDALONE) + add_dependencies(${name} clang-tablegen-targets) + endif() # Add in any extra C++ compilation flags for this library. target_compile_options(${name} PRIVATE ${PARAM_EXTRA_CXXFLAGS}) diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt index 1ac013b..804e950 100644 --- a/lldb/lit/CMakeLists.txt +++ b/lldb/lit/CMakeLists.txt @@ -26,9 +26,6 @@ list(APPEND LLDB_TEST_DEPS llvm-config llvm-mc llvm-objcopy - FileCheck - count - not ) if(TARGET lld) @@ -55,6 +52,14 @@ configure_lit_site_cfg( ${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg) +if(NOT LLDB_BUILT_STANDALONE) + list(APPEND LLDB_TEST_DEPS + FileCheck + count + not + ) +endif() + add_lit_testsuite(check-lldb-lit "Running lldb lit test suite" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${LLDB_TEST_DEPS} |