fix: enable building without threads (#964)

google · Oct 6, 2023 · 1dffb4e · 1dffb4e
1 parent 747b8a0
commit 1dffb4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -468,17 +468,14 @@ set (GLOG_SRCS
   src/demangle.h
   src/logging.cc
   src/raw_logging.cc
+  src/signalhandler.cc
   src/symbolize.cc
   src/symbolize.h
   src/utilities.cc
   src/utilities.h
   src/vlog_is_on.cc
 )
 
-if (HAVE_PTHREAD OR WIN32 OR CYGWIN)
-  list (APPEND GLOG_SRCS src/signalhandler.cc)
-endif (HAVE_PTHREAD OR WIN32 OR CYGWIN)
-
 if (CYGWIN OR WIN32)
   list (APPEND GLOG_SRCS
     src/windows/port.cc

diff --git a/src/googletest.h b/src/googletest.h
@@ -595,7 +595,8 @@ class Thread {
   void Start() { pthread_create(&th_, nullptr, &Thread::InvokeThread, this); }
   void Join() { pthread_join(th_, nullptr); }
 #else
-# error No thread implementation.
+  void Start() {}
+  void Join() {}
 #endif
 
  protected:
@@ -614,7 +615,7 @@ class Thread {
   }
   HANDLE handle_;
   DWORD th_;
-#else
+#elif defined(HAVE_PTHREAD)
   pthread_t th_;
 #endif
 };