Mercurial > hg > orthanc

changeset 1061:4b4ab35c04f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for visual studio 2012
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 Jul 2014 14:34:39 +0200
parents 303eb5e09a4b
children 804a75413ee7
files Resources/CMake/GoogleTestConfiguration.cmake
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Fri Jul 25 14:29:55 2014 +0200
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Fri Jul 25 14:34:39 2014 +0200
@@ -23,6 +23,11 @@
     ${GTEST_SOURCES_DIR}/src/gtest-all.cc
     )
 
+  # https://code.google.com/p/googletest/issues/detail?id=412
+  if (MSVC) # VS2012 does not support tuples correctly yet
+    add_definitions(/D _VARIADIC_MAX=10)
+  endif()
+
 else()
   include(FindGTest)
   if (NOT GTEST_FOUND)