Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meson: Update version requirement for GTest (>= 1.10.0) #1131

Merged
merged 1 commit into from Mar 25, 2023
Merged

meson: Update version requirement for GTest (>= 1.10.0) #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
・alsa-lib (-Dalsa=enabled)
・openssl 1.1.1 以上 (-Dtls=openssl)
・migemo (-Dmigemo=enabled)
・googletest (`test/RADME.md`を参照)
・googletest 1.10.0 以上 (`test/RADME.md`を参照)

WebPやAVIF画像の表示に必要なパッケージ
インストールされていない環境では`.webp`や`.avif`で終わるURLは通常リンクになる。
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/make.md
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ layout: default
- alsa-lib (`-Dalsa=enabled`)
- openssl 1.1.1 以上 (`-Dtls=openssl`)
- migemo (`-Dmigemo=enabled`)
- googletest ([test/RADME.md][testreadme]を参照)
- googletest 1.10.0 以上 ([test/RADME.md][testreadme]を参照)

#### WebPやAVIF画像の表示に必要なパッケージ
インストールされていない環境では`.webp`や`.avif`で終わるURLは通常リンクになる。
Expand Down
4 changes: 2 additions & 2 deletions meson.build
View file
Open in desktop
Expand Up @@ -151,9 +151,9 @@ endif
build_tests_opt = get_option('build_tests')
if not build_tests_opt.disabled()
# ディストロのパッケージとmeson wrapに対応
gtest_main_dep = dependency('gtest',
main : true,
gtest_main_dep = dependency('gtest_main',
fallback : ['gtest', 'gtest_main_dep'],
version : '>= 1.10.0',
required : build_tests_opt)
build_tests = gtest_main_dep.found()
else
Expand Down