Merge remote-tracking branch 'llvm/master' into upstream-with-swift

swift-ci · swift-ci · commit 168152fc0ea8 · 2019-08-20T06:19:11.000-07:00
diff --git a/unittests/TestingSupport/CMakeLists.txt b/unittests/TestingSupport/CMakeLists.txt
@@ -10,3 +10,4 @@ add_lldb_library(lldbUtilityHelpers
     Support
     ObjectYAML
   )
+include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include)

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,4 @@ add_lldb_library(lldbUtilityHelpers`
`10`	`10`	`Support`
`11`	`11`	`ObjectYAML`
`12`	`12`	`)`
	`13`	`+include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include)`