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 | |
| 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)
| -rw-r--r-- | tests/gtest/cmake/internal_utils.cmake | 2 | ||||
| -rw-r--r-- | tests/gtest/include/gtest/internal/gtest-port.h | 5 |
2 files changed, 2 insertions, 5 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() diff --git a/tests/gtest/include/gtest/internal/gtest-port.h b/tests/gtest/include/gtest/internal/gtest-port.h index 7d6e46581..cb0639b4b 100644 --- a/tests/gtest/include/gtest/internal/gtest-port.h +++ b/tests/gtest/include/gtest/internal/gtest-port.h @@ -1553,10 +1553,7 @@ class GTEST_API_ Notification { }; # endif // GTEST_HAS_NOTIFICATION_ -// On MinGW, we can have both GTEST_OS_WINDOWS and GTEST_HAS_PTHREAD -// defined, but we don't want to use MinGW's pthreads implementation, which -// has conformance problems with some versions of the POSIX standard. -# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW +# if GTEST_HAS_PTHREAD // As a C-function, ThreadFuncWithCLinkage cannot be templated itself. // Consequently, it cannot select a correct instantiation of ThreadWithParam |