summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2013-11-15 10:21:15 +0000
committerChandler Carruth <chandlerc@gmail.com>2013-11-15 10:21:15 +0000
commitace535093b49019488d9ddcda295fc48fe617b1f (patch)
tree069075af20e524a8f37f085e675373559568f73b
parentaf1a7141afb058e044d4d3c2746abf491771e45b (diff)
downloadcompiler-rt-ace535093b49019488d9ddcda295fc48fe617b1f.tar.gz
LLVM's GoogleTest copy has moved its source code back to the default
location, update this reference to reflect that. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@194802 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--cmake/Modules/AddCompilerRT.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
index eee23ea61..fd117ac52 100644
--- a/cmake/Modules/AddCompilerRT.cmake
+++ b/cmake/Modules/AddCompilerRT.cmake
@@ -109,10 +109,11 @@ endmacro()
# Unittests support.
set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
-set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/gtest-all.cc)
+set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
set(COMPILER_RT_GTEST_INCLUDE_CFLAGS
-DGTEST_NO_LLVM_RAW_OSTREAM=1
-I${COMPILER_RT_GTEST_PATH}/include
+ -I${COMPILER_RT_GTEST_PATH}
)
# Use Clang to link objects into a single executable with just-built