Merge topic 'FindGTest-fixups'

8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
This commit is contained in:
Brad King 2017-01-11 09:58:14 -05:00 committed by CMake Topic Stage
commit 1406408e61

View File

@ -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()