[AArch64] Wrong CC access in CSINC-conditional branch sequence

[oota-llvm.git] / utils / unittest / CMakeLists.txt

diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
index 99741c8f056e28479f9da5a28857d3f37c635c4e..b6d2d6d9e0e99df82067d6182f3b3c9c15027538 100644 (file)
--- a/utils/unittest/CMakeLists.txt
+++ b/utils/unittest/CMakeLists.txt
@@ -14,23 +14,35 @@
 # Where gtest's .h files can be found.
 include_directories(
   googletest/include
+  googletest
   )
 
 if(WIN32)
   add_definitions(-DGTEST_OS_WINDOWS=1)
 endif()
 
-if (LLVM_INCLUDE_TESTS OR LLVM_BUILD_TESTS)
-  add_llvm_library(gtest
-    googletest/gtest.cc
-    googletest/gtest-death-test.cc
-    googletest/gtest-filepath.cc
-    googletest/gtest-port.cc
-    googletest/gtest-test-part.cc
-    googletest/gtest-typed-test.cc
-    )
-
-  add_llvm_library(gtest_main
-    UnitTestMain/TestMain.cpp
-    )
+if(SUPPORTS_NO_VARIADIC_MACROS_FLAG)
+  add_definitions("-Wno-variadic-macros")
 endif()
+
+set(LLVM_REQUIRES_RTTI 1)
+add_definitions( -DGTEST_HAS_RTTI=0 )
+
+if (NOT LLVM_ENABLE_THREADS)
+  add_definitions( -DGTEST_HAS_PTHREAD=0 )
+endif()
+
+# Visual Studio 2012 only supports up to 8 template parameters in
+# std::tr1::tuple by default, but gtest requires 10
+if(MSVC AND MSVC_VERSION EQUAL 1700)
+  add_definitions(-D_VARIADIC_MAX=10)
+endif ()
+
+add_llvm_library(gtest
+  googletest/src/gtest-all.cc
+
+  LINK_LIBS
+  LLVMSupport # Depends on llvm::raw_ostream
+  )
+
+add_subdirectory(UnitTestMain)