diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-24 09:01:13 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-09-24 09:01:13 +0000 |
| commit | ee6944f4ab4258e6b7b9c91c0c18444193d6f55a (patch) | |
| tree | f2ae8d853d901e248eeee9abc7dcf66b7bd5c02b /utils/unittest/googletest | |
| parent | c8417d7165e156739cd768713db0113383ede07e (diff) | |
| download | llvm-ee6944f4ab4258e6b7b9c91c0c18444193d6f55a.tar.gz llvm-ee6944f4ab4258e6b7b9c91c0c18444193d6f55a.tar.bz2 llvm-ee6944f4ab4258e6b7b9c91c0c18444193d6f55a.tar.xz | |
CMake: Build unittests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114725 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest')
| -rw-r--r-- | utils/unittest/googletest/include/gtest/internal/gtest-port.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 9683271e48..3d076eb44c 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -403,7 +403,8 @@ // defining __GNUC__ and friends, but cannot compile GCC's tuple // implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB // Feature Pack download, which we cannot assume the user has. -#if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ +#if (defined(__GNUC__) && !(defined(__CUDACC__) || defined(__clang__)) \ + && (GTEST_GCC_VER_ >= 40000)) \ || _MSC_VER >= 1600 #define GTEST_USE_OWN_TR1_TUPLE 0 #else |