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

Merge branch 'Added_gtest-1.8' into 'master'

Browse Source 
Updated finder to search for latest googletest as well

See merge request !124
This commit is contained in:
Jan Möbius
2017-02-06 09:41:33 +01:00
parent 57bc372adc 8712eac97d
commit b2db4f4d6a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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.8.0/include
~/sw/gtest-1.7.0/include ~/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
@@ -52,6 +53,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.8.0/lib
~/sw/gtest-1.7.0/lib ~/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
@@ -62,6 +64,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.8.0/lib
~/sw/gtest-1.7.0/lib ~/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