[llvm-branch-commits] [lldb] r352491 - Merging r352382:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Jan 29 05:32:41 2019
New Revision: 352491

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

Modified:
    lldb/branches/release_80/   (props changed)
    lldb/branches/release_80/cmake/modules/AddLLDB.cmake
    lldb/branches/release_80/lit/CMakeLists.txt

Propchange: lldb/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 29 05:32:41 2019
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:351327,351504,352116
+/lldb/trunk:351327,351504,352116,352382

Modified: lldb/branches/release_80/cmake/modules/AddLLDB.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/cmake/modules/AddLLDB.cmake?rev=352491&r1=352490&r2=352491&view=diff
==============================================================================
--- lldb/branches/release_80/cmake/modules/AddLLDB.cmake (original)
+++ lldb/branches/release_80/cmake/modules/AddLLDB.cmake Tue Jan 29 05:32:41 2019
@@ -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})

Modified: lldb/branches/release_80/lit/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/lit/CMakeLists.txt?rev=352491&r1=352490&r2=352491&view=diff
==============================================================================
--- lldb/branches/release_80/lit/CMakeLists.txt (original)
+++ lldb/branches/release_80/lit/CMakeLists.txt Tue Jan 29 05:32:41 2019
@@ -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}