Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved OpenMesh cmake finder for Xcode 5.1.1 with gtest 1.7

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1086 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2014-06-11 09:16:06 +00:00
parent d77c740b86
commit c869221b70
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindGoogleTest.cmake
View File

@@ -42,6 +42,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
else(GTEST_PREFIX) else(GTEST_PREFIX)
find_path(_GTEST_INCLUDE_DIR "gtest/gtest.h" find_path(_GTEST_INCLUDE_DIR "gtest/gtest.h"
PATHS PATHS
~/sw/gtest-1.7.0/include
~/sw/gtest/include ~/sw/gtest/include
/ACG/acgdev/gcc-4.7-x86_64/gtest/include /ACG/acgdev/gcc-4.7-x86_64/gtest/include
/opt/local/include /opt/local/include
@@ -51,6 +52,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
find_library(_GTEST_LIBRARY gtest find_library(_GTEST_LIBRARY gtest
PATHS PATHS
~/sw/gtest-1.7.0/lib
~/sw/gtest/lib ~/sw/gtest/lib
/ACG/acgdev/gcc-4.7-x86_64/gtest/lib /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
/opt/local/lib /opt/local/lib
@@ -60,6 +62,7 @@ else(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES AND GTEST_MAIN_LIBRARIES)
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
find_library(_GTEST_MAIN_LIBRARY gtest_main find_library(_GTEST_MAIN_LIBRARY gtest_main
PATHS PATHS
~/sw/gtest-1.7.0/lib
~/sw/gtest/lib ~/sw/gtest/lib
/ACG/acgdev/gcc-4.7-x86_64/gtest/lib /ACG/acgdev/gcc-4.7-x86_64/gtest/lib
/opt/local/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") "Libraries to link for Google Test automatic main() definition")
endif() 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 set(GTEST_LIBRARY_DIR ${_GTEST_LIBRARY_DIR} CACHE FILEPATH
"Library dir containing Google Test libraries") "Library dir containing Google Test libraries")
mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR ) mark_as_advanced(GTEST_INCLUDE_DIRS GTEST_LIBRARIES GTEST_MAIN_LIBRARIES GTEST_LIBRARY_DIR )