diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-07 13:56:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-07 13:56:44 (GMT) |
| commit | 1ee7a4ec77fe9d3be8160de19ded53e3afe9ce95 (patch) | |
| tree | 9fa402c9fbe0c9fba9a55bf204b38b551a98c37c | |
| parent | 0f0a4d43f46cf62c4db17880e60c6c06fe6ea151 (diff) | |
| parent | df18cd1dd57bf661ca81e5b5a5679697047811d7 (diff) | |
| download | CMake-1ee7a4ec77fe9d3be8160de19ded53e3afe9ce95.zip CMake-1ee7a4ec77fe9d3be8160de19ded53e3afe9ce95.tar.gz CMake-1ee7a4ec77fe9d3be8160de19ded53e3afe9ce95.tar.bz2 | |
Merge topic 'FindGTest-main-debug'
df18cd1d FindGTest: Add gtestd_main variant of debug library
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !931
| -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) |