1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00

Merge pull request #13304 from fzakaria/small-fix

Fix overriding gtest with gmock
This commit is contained in:
Eelco Dolstra 2025-06-02 14:02:47 +02:00 committed by GitHub
commit 86767349d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

3
.gitignore vendored
View file

@ -47,3 +47,6 @@ result-*
.DS_Store
flake-regressions
# direnv
.direnv/

View file

@ -32,8 +32,8 @@ deps_private += rapidcheck
gtest = dependency('gtest')
deps_private += gtest
gtest = dependency('gmock')
deps_private += gtest
gmock = dependency('gmock')
deps_private += gmock
configdata = configuration_data()
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())