diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-03 13:35:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-03 13:36:59 (GMT) |
| commit | 54b69bd6426bffae6ba11b4d0d95a4ad8c31b309 (patch) | |
| tree | 258f3fa112af1ff712bc7a3cdc0d21ab0ef495b2 | |
| parent | cee20ad5374e2547cad9f2847006cf753c301042 (diff) | |
| parent | aaf24357802f577830659a441fdf41da83642b43 (diff) | |
| download | CMake-54b69bd6426bffae6ba11b4d0d95a4ad8c31b309.zip CMake-54b69bd6426bffae6ba11b4d0d95a4ad8c31b309.tar.gz CMake-54b69bd6426bffae6ba11b4d0d95a4ad8c31b309.tar.bz2 | |
Merge topic 'gtest-1.8.1'
aaf2435780 FindGTest: Add support for googletest 1.8.1 folder structure
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3756
| -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() |