update build system -> zig v0.15.1

.github/workflows/build.yml

@@ -1,9 +1,11 @@
 name: Build and Test
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   build:
@@ -12,31 +14,26 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
         target: [
-          native,
-          x86_64-linux-gnu,
-          x86_64-linux-musl,
-          x86_64-windows,
-          aarch64-macos,
-          aarch64-linux-gnu,
-          aarch64-linux-musl
-          # TODO: bsd
-        ]
-        optimize: [
-          Debug,
-          ReleaseSafe,
-          ReleaseFast,
-          ReleaseSmall
-        ]
+            native,
+            x86_64-linux-gnu,
+            x86_64-linux-musl,
+            x86_64-windows,
+            aarch64-macos,
+            aarch64-linux-gnu,
+            aarch64-linux-musl,
+            # TODO: bsd
+          ]
+        optimize: [Debug, ReleaseSafe, ReleaseFast, ReleaseSmall]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Setup Zig
-        uses: mlugg/setup-zig@v1
+        uses: mlugg/setup-zig@v2
         with:
-          version: 0.13.0
+          version: 0.15.1
 
       - name: Build
         run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }}

README.md

@@ -0,0 +1,27 @@
+# GoogleTest
+
+This is a port of [googletest](https://github.com/google/googletest)
+using Zig v0.15.1 as a build system.
+
+## Setup
+
+Fetch and add to `build.zig.zon`:
+
+```sh
+zig fetch --save git+https://github.com/nooneknowspeter/googletest
+```
+
+Add to `build.zig`:
+
+```zig
+const dep_gtest = b.dependency("googletest", .{});
+
+cpplings.root_module.linkLibrary(dep_gtest.artifact("gtest"));
+```
+
+Use [compile_flagz](https://github.com/deevus/compile_flagz) to get headers
+for clangd, `compile_flags.txt`:
+
+```zig
+cflags.addIncludePath(dep_gtest.path("include"));
+```

build.zig

@@ -6,36 +6,29 @@ pub fn build(b: *std.Build) void {
 
     const googletest_dep = b.dependency("googletest", .{});
 
-    const gtest = b.addStaticLibrary(.{
-        .name = "gtest",
-        .target = target,
-        .optimize = optimize,
-        .link_libc = true,
-    });
-    gtest.linkLibCpp();
-    gtest.addCSourceFile(.{
-        .file = googletest_dep.path("googletest/src/gtest-all.cc"),
-        .flags = &.{},
-    });
-    gtest.addIncludePath(googletest_dep.path("googletest/include"));
-    gtest.addIncludePath(googletest_dep.path("googletest"));
+    const gtest = b.addLibrary(.{ .name = "gtest", .root_module = b.createModule(.{ .target = target, .optimize = optimize, .link_libc = true, .link_libcpp = true }) });
+
+    gtest.root_module.addCSourceFile(.{ .file = googletest_dep.path("googletest/src/gtest-all.cc"), .flags = &.{} });
+    gtest.root_module.addIncludePath(googletest_dep.path("googletest/include"));
+    gtest.root_module.addIncludePath(googletest_dep.path("googletest"));
     gtest.installHeadersDirectory(googletest_dep.path("googletest/include"), ".", .{});
 
     b.installArtifact(gtest);
 
-    const gtest_main = b.addStaticLibrary(.{
-        .name = "gtest_main",
+    const gtest_main = b.addLibrary(.{ .name = "gtest_main", .root_module = b.createModule(.{
         .target = target,
         .optimize = optimize,
         .link_libc = true,
-    });
-    gtest_main.linkLibCpp();
-    gtest_main.addCSourceFile(.{
+        .link_libcpp = true,
+    }) });
+
+    gtest_main.root_module.addCSourceFile(.{
         .file = googletest_dep.path("googletest/src/gtest_main.cc"),
         .flags = &.{},
     });
-    gtest_main.addIncludePath(googletest_dep.path("googletest/include"));
-    gtest_main.addIncludePath(googletest_dep.path("googletest"));
+    gtest_main.root_module.addIncludePath(googletest_dep.path("googletest/include"));
+    gtest_main.root_module.addIncludePath(googletest_dep.path("googletest"));
     gtest_main.installHeadersDirectory(googletest_dep.path("googletest/include"), ".", .{});
+
     b.installArtifact(gtest_main);
 }

build.zig.zon

@@ -1,15 +1,8 @@
 .{
-    .name = "googletest",
-    .version = "1.15.2",
-    .dependencies = .{
-        .googletest = .{
-            .url = "https://github.com/google/googletest/archive/refs/tags/v1.15.2.tar.gz",
-            .hash = "122001093b5794ecf5a5b53887622c75d633af2b0c3402a266ce45c6aa4d179c53ba",
-        },
-    },
-    .paths = .{
-        "build.zig",
-        "build.zig.zon",
-        "LICENSE",
-    },
+    .name = .googletest,
+    .version = "1.17.0",
+    .fingerprint = 0xc36e6f7a168f0cc9,
+    .minimum_zig_version = "0.15.1",
+    .dependencies = .{ .googletest = .{ .url = "https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz", .hash = "N-V-__8AAEV8PgDOBc81AuVJQ9XhGo46f-4dlQ7sXar_M0_i" } },
+    .paths = .{ "README.md", "build.zig", "build.zig.zon", "LICENSE", "include/" },
 }