diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-11 14:58:14 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-11 14:58:14 (GMT) |
| commit | 1406408e61a001728eded5a7f28f3c392ff31c38 (patch) | |
| tree | 92f05e8c4d48617e6d0288a79a9747ca4146ff36 /Modules | |
| parent | 22dfda11121c2b0c2374a5eb29fd3a2f140ff92c (diff) | |
| parent | 8deb913d983eee5ad1439ccb98244817d8912602 (diff) | |
| download | CMake-1406408e61a001728eded5a7f28f3c392ff31c38.zip CMake-1406408e61a001728eded5a7f28f3c392ff31c38.tar.gz CMake-1406408e61a001728eded5a7f28f3c392ff31c38.tar.bz2 | |
Merge topic 'FindGTest-fixups'
8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTest.cmake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index 76ab716..6540171 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -49,8 +49,8 @@ # The root directory of the Google Test installation (may also be # set as an environment variable) # ``GTEST_MSVC_SEARCH`` -# If compiling with MSVC, this variable can be set to ``MD`` or -# ``MT`` (the default) to enable searching a GTest build tree +# If compiling with MSVC, this variable can be set to ``MT`` or +# ``MD`` (the default) to enable searching a GTest build tree # # # Example usage @@ -160,11 +160,17 @@ if(MSVC) if(GTEST_MSVC_SEARCH STREQUAL "MD") list(APPEND _gtest_libpath_suffixes msvc/gtest-md/Debug - msvc/gtest-md/Release) + msvc/gtest-md/Release + msvc/x64/Debug + msvc/x64/Release + ) elseif(GTEST_MSVC_SEARCH STREQUAL "MT") list(APPEND _gtest_libpath_suffixes msvc/gtest/Debug - msvc/gtest/Release) + msvc/gtest/Release + msvc/x64/Debug + msvc/x64/Release + ) endif() endif() |