diff options
| author | Kelby Faessler <kmfaessler@gmail.com> | 2019-08-29 19:27:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-08-30 15:24:27 (GMT) |
| commit | aaf24357802f577830659a441fdf41da83642b43 (patch) | |
| tree | 93eb3370f187c57e8b66149558f1245f17d22b57 | |
| parent | 3ec986ce8e8df269eb6b6b9f37e12b02194168fd (diff) | |
| download | CMake-aaf24357802f577830659a441fdf41da83642b43.zip CMake-aaf24357802f577830659a441fdf41da83642b43.tar.gz CMake-aaf24357802f577830659a441fdf41da83642b43.tar.bz2 | |
FindGTest: Add support for googletest 1.8.1 folder structure
| -rw-r--r-- | Help/release/dev/gtest-1.8.1.rst | 5 | ||||
| -rw-r--r-- | Modules/FindGTest.cmake | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Help/release/dev/gtest-1.8.1.rst b/Help/release/dev/gtest-1.8.1.rst new file mode 100644 index 0000000..2e48da4 --- /dev/null +++ b/Help/release/dev/gtest-1.8.1.rst @@ -0,0 +1,5 @@ +gtest-1.8.1 +----------- + +* The :module:`FindGTest` module has been updated to recognize + MSVC build trees generated by GTest 1.8.1. diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index b0175fe..e015a98 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -160,6 +160,10 @@ if(MSVC) msvc/gtest-md/Release msvc/x64/Debug msvc/x64/Release + msvc/2010/gtest-md/Win32-Debug + msvc/2010/gtest-md/Win32-Release + msvc/2010/gtest-md/x64-Debug + msvc/2010/gtest-md/x64-Release ) elseif(GTEST_MSVC_SEARCH STREQUAL "MT") list(APPEND _gtest_libpath_suffixes @@ -167,6 +171,10 @@ if(MSVC) msvc/gtest/Release msvc/x64/Debug msvc/x64/Release + msvc/2010/gtest/Win32-Debug + msvc/2010/gtest/Win32-Release + msvc/2010/gtest/x64-Debug + msvc/2010/gtest/x64-Release ) endif() endif() |