From b026ea2f0e2c900ed88e10de39884167a484081b Mon Sep 17 00:00:00 2001
From: Lukas Kastern <lukaskastern@web.de>
Date: Sun, 1 Jun 2025 18:37:54 +0200
Subject: [PATCH 1/2] add gmock

---
 build.zig | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/build.zig b/build.zig
index b3ba948..56ec95b 100644
--- a/build.zig
+++ b/build.zig
@@ -23,6 +23,24 @@ pub fn build(b: *std.Build) void {
 
     b.installArtifact(gtest);
 
+    const gmock = b.addStaticLibrary(.{
+        .name = "gmock",
+        .target = target,
+        .optimize = optimize,
+        .link_libc = true,
+    });
+    gmock.linkLibCpp();
+    gmock.addCSourceFile(.{
+        .file = googletest_dep.path("googlemock/src/gmock-all.cc"),
+        .flags = &.{},
+    });
+    gmock.addIncludePath(googletest_dep.path("googlemock/include"));
+    gmock.addIncludePath(googletest_dep.path("googlemock"));
+    gmock.installHeadersDirectory(googletest_dep.path("googlemock/include"), ".", .{});
+
+    gmock.linkLibrary(gtest);
+    b.installArtifact(gmock);
+
     const gtest_main = b.addStaticLibrary(.{
         .name = "gtest_main",
         .target = target,

From f8acbec3df11c23efebe6aa9efba2d79cc42e727 Mon Sep 17 00:00:00 2001
From: Lukas Kastern <work@lukaskastern.com>
Date: Sat, 9 May 2026 18:43:52 +0200
Subject: [PATCH 2/2] upgrade

---
 build.zig | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/build.zig b/build.zig
index 2bd954c..abc4b00 100644
--- a/build.zig
+++ b/build.zig
@@ -11,9 +11,10 @@ pub fn build(b: *std.Build) void {
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
+            .link_libcpp = true,
         }),
     });
-    gtest.linkLibCpp();
+
     gtest.root_module.addCSourceFile(.{
         .file = gtest_dep.path("googletest/src/gtest-all.cc"),
         .flags = &.{"-std=c++17"},
@@ -28,9 +29,9 @@ pub fn build(b: *std.Build) void {
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
+            .link_libcpp = true,
         }),
     });
-    gtest_main.linkLibCpp();
     gtest_main.root_module.addCSourceFile(.{
         .file = gtest_dep.path("googletest/src/gtest_main.cc"),
         .flags = &.{"-std=c++17"},
@@ -45,17 +46,18 @@ pub fn build(b: *std.Build) void {
         .root_module = b.createModule(.{
             .target = target,
             .optimize = optimize,
+            .link_libcpp = true,
         }),
     });
     gmock.root_module.addCSourceFile(.{
         .file = gtest_dep.path("googlemock/src/gmock-all.cc"),
         .flags = &.{"-std=c++17"},
     });
-    gmock.linkLibCpp();
-    gmock.addIncludePath(gtest_dep.path("googlemock/include"));
-    gmock.addIncludePath(gtest_dep.path("googlemock"));
+
+    gmock.root_module.addIncludePath(gtest_dep.path("googlemock/include"));
+    gmock.root_module.addIncludePath(gtest_dep.path("googlemock"));
     gmock.installHeadersDirectory(gtest_dep.path("googlemock/include"), ".", .{});
-    gmock.linkLibrary(gtest);
+    gmock.root_module.linkLibrary(gtest);
     b.installArtifact(gmock);
 
     const samples_exe = b.addExecutable(.{
@@ -65,7 +67,7 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    samples_exe.addCSourceFiles(.{
+    samples_exe.root_module.addCSourceFiles(.{
         .root = gtest_dep.path("googletest/samples"),
         .files = &.{
             "sample1_unittest.cc",
@@ -81,8 +83,8 @@ pub fn build(b: *std.Build) void {
             "sample8_unittest.cc",
         },
     });
-    samples_exe.linkLibrary(gtest);
-    samples_exe.linkLibrary(gtest_main);
+    samples_exe.root_module.linkLibrary(gtest);
+    samples_exe.root_module.linkLibrary(gtest_main);
     b.installArtifact(samples_exe);
 
     // Samples 9 and 10 define their own entrypoint.
@@ -93,13 +95,13 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    sample9_exe.addCSourceFiles(.{
+    sample9_exe.root_module.addCSourceFiles(.{
         .root = gtest_dep.path("googletest/samples"),
         .files = &.{
             "sample9_unittest.cc",
         },
     });
-    sample9_exe.linkLibrary(gtest);
+    sample9_exe.root_module.linkLibrary(gtest);
     b.installArtifact(sample9_exe);
 
     const sample10_exe = b.addExecutable(.{
@@ -109,11 +111,11 @@ pub fn build(b: *std.Build) void {
             .optimize = optimize,
         }),
     });
-    sample10_exe.addCSourceFiles(.{
+    sample10_exe.root_module.addCSourceFiles(.{
         .root = gtest_dep.path("googletest/samples"),
         .files = &.{"sample10_unittest.cc"},
     });
-    sample10_exe.linkLibrary(gtest);
+    sample10_exe.root_module.linkLibrary(gtest);
     b.installArtifact(sample10_exe);
 
     const samples_step = b.step("samples", "Build the sample tests");