diff options
| author | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-10-07 18:12:54 +0000 |
|---|---|---|
| committer | Michael J. Spencer <bigcheesegs@gmail.com> | 2010-10-07 18:12:54 +0000 |
| commit | 1cade330affc01142f43e8c46a8e34278740ad53 (patch) | |
| tree | 6001fc2784890ee331dd0cf5fd785fa3e761494d | |
| parent | 2c81296bc237cb26c2bb789514e331b3b5b31f79 (diff) | |
| download | llvm-1cade330affc01142f43e8c46a8e34278740ad53.tar.gz llvm-1cade330affc01142f43e8c46a8e34278740ad53.tar.bz2 llvm-1cade330affc01142f43e8c46a8e34278740ad53.tar.xz | |
CMake: Fix warning in gtest.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115935 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | cmake/config-ix.cmake | 2 | ||||
| -rw-r--r-- | utils/unittest/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index cb83eab2a5..b84fa5d680 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -165,6 +165,8 @@ if( NOT WIN32 ) check_cxx_compiler_flag("-fPIC" SUPPORTS_FPIC_FLAG) endif() +check_cxx_compiler_flag("-Wno-variadic-macros" SUPPORTS_NO_VARIADIC_MACROS_FLAG) + include(GetTargetTriple) get_target_triple(LLVM_HOSTTRIPLE) diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt index 7068546301..4400b38234 100644 --- a/utils/unittest/CMakeLists.txt +++ b/utils/unittest/CMakeLists.txt @@ -20,6 +20,10 @@ if(WIN32) add_definitions(-DGTEST_OS_WINDOWS=1) endif() +if(SUPPORTS_NO_VARIADIC_MACROS_FLAG) + add_definitions("-Wno-variadic-macros") +endif() + add_llvm_library(gtest googletest/gtest.cc googletest/gtest-death-test.cc |