[llvm-commits] [llvm] r115935 - in /llvm/trunk: cmake/config-ix.cmake utils/unittest/CMakeLists.txt

[Michael J. Spencer]

Author: mspencer
Date: Thu Oct  7 13:12:54 2010
New Revision: 115935

URL: http://llvm.org/viewvc/llvm-project?rev=115935&view=rev
Log:
CMake: Fix warning in gtest.

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/utils/unittest/CMakeLists.txt

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=115935&r1=115934&r2=115935&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Thu Oct  7 13:12:54 2010
@@ -165,6 +165,8 @@
   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)
 

Modified: llvm/trunk/utils/unittest/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/CMakeLists.txt?rev=115935&r1=115934&r2=115935&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/CMakeLists.txt (original)
+++ llvm/trunk/utils/unittest/CMakeLists.txt Thu Oct  7 13:12:54 2010
@@ -20,6 +20,10 @@
   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