diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17b940b..b27e327 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,9 +34,9 @@ jobs: submodules: recursive - name: Setup Zig - uses: mlugg/setup-zig@v1 + uses: mlugg/setup-zig@v2 with: - version: 0.13.0 + version: 0.15.2 - name: Build run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }} diff --git a/build.zig b/build.zig index b3ba948..71b2bfd 100644 --- a/build.zig +++ b/build.zig @@ -6,13 +6,15 @@ pub fn build(b: *std.Build) void { const googletest_dep = b.dependency("googletest", .{}); - const gtest = b.addStaticLibrary(.{ + const gtest = b.addLibrary(.{ .name = "gtest", - .target = target, - .optimize = optimize, - .link_libc = true, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + .link_libc = true, + .link_libcpp = true, + }), }); - gtest.linkLibCpp(); gtest.addCSourceFile(.{ .file = googletest_dep.path("googletest/src/gtest-all.cc"), .flags = &.{}, @@ -23,13 +25,15 @@ pub fn build(b: *std.Build) void { b.installArtifact(gtest); - const gtest_main = b.addStaticLibrary(.{ + const gtest_main = b.addLibrary(.{ .name = "gtest_main", - .target = target, - .optimize = optimize, - .link_libc = true, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + .link_libc = true, + .link_libcpp = true, + }), }); - gtest_main.linkLibCpp(); gtest_main.addCSourceFile(.{ .file = googletest_dep.path("googletest/src/gtest_main.cc"), .flags = &.{}, diff --git a/build.zig.zon b/build.zig.zon index 9456786..ee1f4cc 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,5 +1,6 @@ .{ - .name = "googletest", + .name = .googletest, + .fingerprint = 0xc36e6f7a9bb39c58, .version = "1.15.2", .dependencies = .{ .googletest = .{