diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-06 13:05:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-06 13:05:23 (GMT) |
| commit | 5f8271962b3498ba0e2cb3756afa8f785b275e78 (patch) | |
| tree | be8e728217fc923f76814d71538fc9910561da9b | |
| parent | 56136e6315aa0c2a3e1a11f9c795c180f1cf6a9e (diff) | |
| parent | df18cd1dd57bf661ca81e5b5a5679697047811d7 (diff) | |
| download | CMake-5f8271962b3498ba0e2cb3756afa8f785b275e78.zip CMake-5f8271962b3498ba0e2cb3756afa8f785b275e78.tar.gz CMake-5f8271962b3498ba0e2cb3756afa8f785b275e78.tar.bz2 | |
Merge branch '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 c4b4535..0dbf77f 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 gtest_maind) + _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mdd gtestd_main 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 gtest_maind) + _gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtestd_main gtest_maind) endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) |