This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 44c85ae38a4401379c411a1e3fefce8aefce0eed (commit)
via 8deb913d983eee5ad1439ccb98244817d8912602 (commit)
via eadd395a1396ed78a3ecea7740f8f4735ab84453 (commit)
from 014c446aeeecb24be2a0494f1031cd992fd3d045 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44c85ae38a4401379c411a1e3fefce8aefce0eed
commit 44c85ae38a4401379c411a1e3fefce8aefce0eed
Merge: 014c446 8deb913
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 13:27:15 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 13:27:15 2017 -0500
Merge topic 'FindGTest-fixups' into next
8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8deb913d983eee5ad1439ccb98244817d8912602
commit 8deb913d983eee5ad1439ccb98244817d8912602
Author: Dong XiaoC <godx...@foxmail.com>
AuthorDate: Fri Dec 23 06:31:11 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 13:26:33 2017 -0500
FindGTest: add lib search path for MSVC x64 platform
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()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eadd395a1396ed78a3ecea7740f8f4735ab84453
commit eadd395a1396ed78a3ecea7740f8f4735ab84453
Author: Dong XiaoC <godx...@foxmail.com>
AuthorDate: Fri Dec 23 06:28:25 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jan 10 13:25:59 2017 -0500
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.
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
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTest.cmake | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
