diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-07 16:42:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-07 16:42:04 (GMT) |
| commit | c8a8687bcbd6f15ac2257e642367d451b8b4aae1 (patch) | |
| tree | bcd5b4a014ced57a0e6082554cb0408acb5d4058 | |
| parent | a10c3cc69f037aefc5828b0cad6e44d09ddb39f2 (diff) | |
| parent | ab2954c4716a96fcd00f7fcf1f8592093bbb7627 (diff) | |
| download | CMake-c8a8687bcbd6f15ac2257e642367d451b8b4aae1.zip CMake-c8a8687bcbd6f15ac2257e642367d451b8b4aae1.tar.gz CMake-c8a8687bcbd6f15ac2257e642367d451b8b4aae1.tar.bz2 | |
Merge topic 'revert-FindGTest-main-debug'
ab2954c4 Revert "FindGTest: Add gtestd_main variant of debug library"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !936
| -rw-r--r-- | Modules/FindGTest.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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) |