4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 20:06:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3604

Browse Source 
54d9fff gtest: Fix compilation on MinGW with pthread /googletest#621 (stoffu)
This commit is contained in:
luigi1111 2018-06-08 14:51:32 -05:00
commit 13d73d9ed6
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/gtest/cmake/internal_utils.cmake
View File

@ -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()

5
tests/gtest/include/gtest/internal/gtest-port.h
View File

@ -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