Permalink
Browse files

Fix compilation on MinGW with pthread again

  • Loading branch information...
miltonf committed Jan 28, 2019
1 parent 0cc6c53 commit 80c7f3b6f2dbb56adb0254b6c0f3c828d1e1d949
Showing with 2 additions and 2 deletions.
  1. +1 −1 tests/gtest/cmake/internal_utils.cmake
  2. +1 −1 tests/gtest/include/gtest/internal/gtest-port.h
@@ -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 AND NOT MINGW)
if (NOT gtest_disable_pthreads)
# Defines CMAKE_USE_PTHREADS_INIT and CMAKE_THREAD_LIBS_INIT.
find_package(Threads)
endif()
@@ -1553,7 +1553,7 @@ class GTEST_API_ Notification {
};
# endif // GTEST_HAS_NOTIFICATION_

# if GTEST_HAS_PTHREAD
# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW

// As a C-function, ThreadFuncWithCLinkage cannot be templated itself.
// Consequently, it cannot select a correct instantiation of ThreadWithParam

0 comments on commit 80c7f3b

Please sign in to comment.