diff options
author | luigi1111 <luigi1111w@gmail.com> | 2018-06-08 14:51:32 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2018-06-08 14:51:32 -0500 |
commit | 13d73d9ed671ef0ca670c1560e296e448efe772c (patch) | |
tree | 2debd7c3729c675c2bf39515bd8b11f042bcc73d /tests/gtest/cmake/internal_utils.cmake | |
parent | Merge pull request #3599 (diff) | |
parent | gtest: Fix compilation on MinGW with pthread /googletest#621 (diff) | |
download | monero-13d73d9ed671ef0ca670c1560e296e448efe772c.tar.xz |
Merge pull request #3604
54d9fff gtest: Fix compilation on MinGW with pthread /googletest#621 (stoffu)
Diffstat (limited to 'tests/gtest/cmake/internal_utils.cmake')
-rw-r--r-- | tests/gtest/cmake/internal_utils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/gtest/cmake/internal_utils.cmake b/tests/gtest/cmake/internal_utils.cmake index 364db5970..567edaa30 100644 --- a/tests/gtest/cmake/internal_utils.cmake +++ b/tests/gtest/cmake/internal_utils.cmake @@ -46,7 +46,7 @@ endmacro() # Google Mock. You can tweak these definitions to suit your need. A # variable's value is empty before it's explicitly assigned to. macro(config_compiler_and_linker) - if (NOT gtest_disable_pthreads) + if (NOT gtest_disable_pthreads AND NOT MINGW) # Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT. find_package(Threads) endif() |