[Lldb-commits] [PATCH] D57233: [CMake] Quick-Fix targets don't exist when building against LLVM install-tree with LLDB_INCLUDE_TESTS=ON

[Phabricator via Phabricator via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rLLDB352382: [CMake] Quick-Fix targets don't exist when 
building against LLVM install-tree… (authored by stefan.graenitz, committed by 
).
Herald added a subscriber: teemperor.

Changed prior to commit:
  https://reviews.llvm.org/D57233?vs=183522&id=183869#toc

Repository:
  rLLDB LLDB

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D57233/new/

https://reviews.llvm.org/D57233

Files:
  cmake/modules/AddLLDB.cmake
  lit/CMakeLists.txt


Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -26,9 +26,6 @@
   llvm-config
   llvm-mc
   llvm-objcopy
-  FileCheck
-  count
-  not
   )
 
 if(TARGET lld)
@@ -55,6 +52,14 @@
   ${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}
Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -88,7 +88,9 @@
   # 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})



Index: lit/CMakeLists.txt
===================================================================
--- lit/CMakeLists.txt
+++ lit/CMakeLists.txt
@@ -26,9 +26,6 @@
   llvm-config
   llvm-mc
   llvm-objcopy
-  FileCheck
-  count
-  not
   )
 
 if(TARGET lld)
@@ -55,6 +52,14 @@
   ${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}
Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -88,7 +88,9 @@
   # 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})

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits