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, master has been updated
via c8a8687bcbd6f15ac2257e642367d451b8b4aae1 (commit)
via ab2954c4716a96fcd00f7fcf1f8592093bbb7627 (commit)
from a10c3cc69f037aefc5828b0cad6e44d09ddb39f2 (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=c8a8687bcbd6f15ac2257e642367d451b8b4aae1
commit c8a8687bcbd6f15ac2257e642367d451b8b4aae1
Merge: a10c3cc ab2954c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 7 16:42:01 2017 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 7 12:42:04 2017 -0400
Merge topic 'revert-FindGTest-main-debug'
ab2954c4 Revert "FindGTest: Add gtestd_main variant of debug library"
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !936
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab2954c4716a96fcd00f7fcf1f8592093bbb7627
commit ab2954c4716a96fcd00f7fcf1f8592093bbb7627
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 7 12:38:25 2017 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 7 12:38:25 2017 -0400
Revert "FindGTest: Add gtestd_main variant of debug library"
The reported variant turned out to be due to a local configuration
problem.
Issue: #16940
diff --git a/Modules/FindGTest.cmake b/Modules/FindGTest.cmake
index 0dbf77f..c4b4535 100644
--- a/Modules/FindGTest.cmake
+++ b/Modules/FindGTest.cmake
@@ -134,12 +134,12 @@ if(MSVC AND GTEST_MSVC_SEARCH STREQUAL "MD")
_gtest_find_library(GTEST_LIBRARY gtest-md gtest)
_gtest_find_library(GTEST_LIBRARY_DEBUG gtest-mdd gtestd)
_gtest_find_library(GTEST_MAIN_LIBRARY gtest_main-md gtest_main)
- _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mdd gtestd_main
gtest_maind)
+ _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mdd gtest_maind)
else()
_gtest_find_library(GTEST_LIBRARY gtest)
_gtest_find_library(GTEST_LIBRARY_DEBUG gtestd)
_gtest_find_library(GTEST_MAIN_LIBRARY gtest_main)
- _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtestd_main gtest_maind)
+ _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_maind)
endif()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTest.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
