From c869221b703baeb731828b087c4f4bcb55e3480b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 11 Jun 2014 09:16:06 +0000 Subject: [PATCH] Improved OpenMesh cmake finder for Xcode 5.1.1 with gtest 1.7 git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1086 fdac6126-5c0c-442c-9429-916003d36597 --- cmake/FindGoogleTest.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake/FindGoogleTest.cmake b/cmake/FindGoogleTest.cmake index 776efb74..a301e8b0 100644 --- a/cmake/FindGoogleTest.cmake +++ b/cmake/FindGoogleTest.cmake @@ -42,7 +42,8 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) else(GTEST_PREFIX) find_path(_GTEST_INCLUDE_DIR "gtest/gtest.h" PATHS - ~/sw/gtest/include + ~/sw/gtest-1.7.0/include + ~/sw/gtest/include /ACG/acgdev/gcc-4.7-x86_64/gtest/include /opt/local/include /usr/local/include @@ -51,6 +52,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) NO_DEFAULT_PATH ) find_library(_GTEST_LIBRARY gtest PATHS + ~/sw/gtest-1.7.0/lib ~/sw/gtest/lib /ACG/acgdev/gcc-4.7-x86_64/gtest/lib /opt/local/lib @@ -60,6 +62,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) NO_DEFAULT_PATH ) find_library(_GTEST_MAIN_LIBRARY gtest_main PATHS + ~/sw/gtest-1.7.0/lib ~/sw/gtest/lib /ACG/acgdev/gcc-4.7-x86_64/gtest/lib /opt/local/lib @@ -90,6 +93,12 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES) "Libraries to link for Google Test automatic main() definition") endif() + # Macro required to use google test with vs2012 + if ( CMAKE_GENERATOR MATCHES "^Visual Studio 11.*" ) + add_definitions(-D_VARIADIC_MAX=10) + endif() + + set(GTEST_LIBRARY_DIR ${_GTEST_LIBRARY_DIR} CACHE FILEPATH "Library dir containing Google Test libraries") mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR )