RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix gtest build issue on Visual Studio 2012 RC

Browse Source 
llvm-svn: 158046
This commit is contained in:
Justin Holewinski 2012-06-06 03:11:20 +00:00
parent a81f430388
commit 10ecba6fa8
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unittests/CMakeLists.txt
View File

@ -15,6 +15,12 @@ function(add_llvm_unittest test_dirname)
set_target_properties(${test_name}Tests PROPERTIES FOLDER "Tests")
endfunction()
# 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_custom_target(UnitTests)
set_target_properties(UnitTests PROPERTIES FOLDER "Tests")

6
utils/unittest/CMakeLists.txt
View File

@ -27,6 +27,12 @@ endif()
set(LLVM_REQUIRES_RTTI 1)
add_definitions( -DGTEST_HAS_RTTI=0 )
# 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/gtest.cc
googletest/gtest-death-test.cc