diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7636534..a0708faa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,6 +284,7 @@ if(UNIX OR MINGW)
     list(APPEND LIBBLOATY_LIBS ${CAPSTONE_LIBRARIES})
   else()
     list(APPEND LIBBLOATY_LIBS capstone-static)
+    add_dependencies(libbloaty capstone-static)
   endif()
   if(ZLIB_FOUND)
     list(APPEND LIBBLOATY_LIBS ZLIB::ZLIB)
@@ -292,6 +293,7 @@ if(UNIX OR MINGW)
   endif()
 else()
   set(LIBBLOATY_LIBS libbloaty libprotoc capstone-static)
+  add_dependencies(libbloaty capstone-static)
   if(BLOATY_ENABLE_RE2)
     list(APPEND LIBBLOATY_LIBS  re2)
   endif()
diff --git a/third_party/googletest b/third_party/googletest
index 565f1b84..96f4ce02 160000
--- a/third_party/googletest
+++ b/third_party/googletest
@@ -1 +1 @@
-Subproject commit 565f1b848215b77c3732bca345fe76a0431d8b34
+Subproject commit 96f4ce02a3a78d63981c67acbd368945d11d7d70