diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-07 16:39:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-07 16:39:57 (GMT) |
| commit | bc5a252a7b1a115c783950caab0c96bf13e7150e (patch) | |
| tree | ba2416a3149eb67ed13ea8ec61bd98ffe2d7c913 | |
| parent | 44e323ca9281eb039b148165e4779310aad3bfcc (diff) | |
| parent | ab2954c4716a96fcd00f7fcf1f8592093bbb7627 (diff) | |
| download | CMake-bc5a252a7b1a115c783950caab0c96bf13e7150e.zip CMake-bc5a252a7b1a115c783950caab0c96bf13e7150e.tar.gz CMake-bc5a252a7b1a115c783950caab0c96bf13e7150e.tar.bz2 | |
Merge branch 'revert-FindGTest-main-debug' into release-3.9
| -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) |