From eadd395a1396ed78a3ecea7740f8f4735ab84453 Mon Sep 17 00:00:00 2001 From: Dong XiaoC Date: Fri, 23 Dec 2016 06:28:25 -0500 Subject: FindGTest: Fix documented GTEST_MSVC_SEARCH default value Documentation updates in commit v3.5.0-rc1~124^2~2 (FindGTest: Add imported targets and update documentation, 2015-12-10) accidentally changed the documented default to the wrong value. Restore the documentation to refer to the actual default used in the implementation. --- Modules/FindGTest.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index 76ab716..931cc18 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 -- cgit v0.12 From 8deb913d983eee5ad1439ccb98244817d8912602 Mon Sep 17 00:00:00 2001 From: Dong XiaoC Date: Fri, 23 Dec 2016 06:31:11 -0500 Subject: FindGTest: add lib search path for MSVC x64 platform --- Modules/FindGTest.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake index 931cc18..6540171 100644 --- a/Modules/FindGTest.cmake +++ b/Modules/FindGTest.cmake @@ -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() -- cgit v0.12