mirror of
https://github.com/NixOS/nix.git
synced 2025-11-08 19:46:02 +01:00
Overriding gtest with gmock
How did this work before...
* Added .direnv/ to gitignore
(cherry picked from commit 58e34a2d27)
This commit is contained in:
parent
0877680b08
commit
82fa307ca6
2 changed files with 5 additions and 2 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -47,3 +47,6 @@ result-*
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
flake-regressions
|
flake-regressions
|
||||||
|
|
||||||
|
# direnv
|
||||||
|
.direnv/
|
||||||
|
|
|
||||||
|
|
@ -32,8 +32,8 @@ deps_private += rapidcheck
|
||||||
gtest = dependency('gtest')
|
gtest = dependency('gtest')
|
||||||
deps_private += gtest
|
deps_private += gtest
|
||||||
|
|
||||||
gtest = dependency('gmock')
|
gmock = dependency('gmock')
|
||||||
deps_private += gtest
|
deps_private += gmock
|
||||||
|
|
||||||
configdata = configuration_data()
|
configdata = configuration_data()
|
||||||
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
|
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue