diff --git a/166.patch b/166.patch new file mode 100644 index 0000000..ea8d8f0 --- /dev/null +++ b/166.patch @@ -0,0 +1,40 @@ +diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h +index 0094ed5..411f132 100644 +--- a/googletest/include/gtest/internal/gtest-port.h ++++ b/googletest/include/gtest/internal/gtest-port.h +@@ -604,7 +604,7 @@ struct _RTL_CRITICAL_SECTION; + || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL) + #endif // GTEST_HAS_PTHREAD + +-#if GTEST_HAS_PTHREAD ++#if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW + // gtest-port.h guarantees to #include when GTEST_HAS_PTHREAD is + // true. + # include // NOLINT +@@ -1441,7 +1441,7 @@ void SetInjectableArgvs(const ::std::vector* + + // Defines synchronization primitives. + #if GTEST_IS_THREADSAFE +-# if GTEST_HAS_PTHREAD ++# if GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW + // Sleeps for (roughly) n milliseconds. This function is only for testing + // Google Test's own constructs. Don't use it in user tests, either + // directly or indirectly. +@@ -1458,7 +1458,7 @@ inline void SleepMilliseconds(int n) { + // Notification has already been imported into the namespace. + // Nothing to do here. + +-# elif GTEST_HAS_PTHREAD ++# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW + // Allows a controller thread to pause execution of newly created + // threads until notified. Instances of this class must be created + // and destroyed in the controller thread. +@@ -1918,7 +1918,7 @@ class ThreadLocal : public ThreadLocalBase { + GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadLocal); + }; + +-# elif GTEST_HAS_PTHREAD ++# elif GTEST_HAS_PTHREAD && !GTEST_OS_WINDOWS_MINGW + + // MutexBase and Mutex implement mutex on pthreads-based platforms. + class MutexBase { diff --git a/conanfile.py b/conanfile.py index 4d6fb02..867cbf4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,7 +12,7 @@ class GTestConan(ConanFile): url = "http://github.com/bincrafters/conan-gtest" license = "BSD 3-Clause" exports = ["LICENSE.md"] - exports_sources = ["CMakeLists.txt", "1339.patch", "FindGTest.cmake", "FindGMock.cmake"] + exports_sources = ["CMakeLists.txt", "1339.patch", "166.patch", "FindGTest.cmake", "FindGMock.cmake"] source_subfolder = "source_subfolder" generators = "cmake" settings = "os", "arch", "compiler", "build_type" @@ -31,6 +31,7 @@ def source(self): os.rename(extracted_dir, self.source_subfolder) tools.patch(base_path=self.source_subfolder, patch_file='1339.patch') + tools.patch(base_path=self.source_subfolder, patch_file='166.patch') def build(self):