LLDB and Flang standalone build fixes

Author: Meinersbur

cmake/Modules/AddGTest.cmake

@@ -9,4 +9,3 @@ function (build_gtest gtest_name)
   endif ()
   add_subdirectory("${LLVM_THIRD_PARTY_DIR}/unittest" "${CMAKE_BINARY_DIR}/third-party/${gtest_name}_gtest")
 endfunction ()
-

flang/CMakeLists.txt

@@ -76,6 +76,11 @@ endif()
 set(MLIR_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../mlir" CACHE PATH "Path to MLIR source tree")
 
 if (FLANG_STANDALONE_BUILD)
+  if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
+    set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
+  endif()
+  list(APPEND CMAKE_MODULE_PATH "${LLVM_COMMON_CMAKE_UTILS}/Modules")
+
   set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
   if (NOT MSVC_IDE)
@@ -226,8 +231,9 @@ if (FLANG_STANDALONE_BUILD)
   if (FLANG_INCLUDE_TESTS)
     set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/unittest)
     if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h)
-      if (NOT TARGET llvm_gtest)
-        add_subdirectory(${UNITTEST_DIR} third-party/unittest)
+      if (NOT TARGET default_gtest)
+        include(AddGTest)
+        build_gtest(flang_gtest LLVM_SUPPORT)
       endif()
       set(FLANG_GTEST_AVAIL 1)
     else()

lldb/cmake/modules/LLDBStandalone.cmake

@@ -106,8 +106,9 @@ include_directories(
 if(LLDB_INCLUDE_TESTS)
   # Build the gtest library needed for unittests, if we have LLVM sources
   # handy.
-  if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest AND NOT TARGET llvm_gtest)
-    add_subdirectory(${LLVM_THIRD_PARTY_DIR}/unittest third-party/unittest)
+  if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest AND NOT TARGET default_gtest)
+    include(AddGTest)
+    build_gtest(lldb_gtest LLVM_SUPPORT)
   endif()
   # LLVMTestingSupport library is needed for Process/gdb-remote.
   if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support

third-party/unittest/CMakeLists.txt

@@ -7,12 +7,28 @@
 # To run the tests for Google Test itself on Linux, use 'make test' or
 # ctest.  You can select which tests to run using 'ctest -R regex'.
 # For more options, run 'ctest --help'.
+#
+# Do not add_subdirectory(third-party/unittest) this file directly.
+# Instead use:
+#
+#     include(AddGTest)
+#     build_gtest(llvm_gtest [LLVM_SUPPORT])
+#
 ########################################################################
 #
 # Project-wide settings
 
 set(LLVM_SUBPROJECT_TITLE "Third-Party/Google Test")
 
+if (NOT gtest_name)
+  message(FATAL_ERROR "Do not add_subdirectory GTest directly. Use the
+    following helper function instead:
+
+    include(AddGTest)
+    build_gtest(llvm_gtest [LLVM_SUPPORT])
+  ")
+endif ()
+
 if (GTEST_USE_LLVM)
   set(GTEST_LLVM_COMPONENTS "Support") # For llvm::raw_ostream
 else ()