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

meson: wire up contrib/credential #1859

Closed
wants to merge 2 commits into from
Closed

meson: wire up contrib/credential #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac8aa6
meson: wire up credential-wincred
hickford Jan 28, 2025
07ce068
meson: wire up credential-libsecret
hickford Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions contrib/credential/libsecret/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
glib = dependency('glib-2.0')
libsecret = dependency('libsecret-1')
executable('git-credential-libsecret', 'git-credential-libsecret.c', dependencies: [glib, libsecret])
6 changes: 6 additions & 0 deletions contrib/credential/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
if get_option('credential_wincred')
subdir('wincred')
endif
if get_option('credential_libsecret')
subdir('libsecret')
endif
2 changes: 2 additions & 0 deletions contrib/credential/wincred/git-credential-wincred.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))

#ifndef _MSC_VER
__attribute__((format (printf, 1, 2)))
#endif
static void die(const char *err, ...)
{
char msg[4096];
Expand Down
1 change: 1 addition & 0 deletions contrib/credential/wincred/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
executable('git-credential-wincred', 'git-credential-wincred.c')
1 change: 1 addition & 0 deletions contrib/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
foreach feature : get_option('contrib')
subdir(feature)
endforeach
subdir('credential')
4 changes: 4 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ option('version', type: 'string', value: '',
# Features supported by Git.
option('contrib', type: 'array', value: [ 'completion' ], choices: [ 'completion', 'subtree' ],
description: 'Contributed features to include.')
option('credential_libsecret', type: 'boolean', value: false,
description: 'Build helper git-credential-libsecret. Requires GLib and libsecret.')
option('credential_wincred', type: 'boolean', value: false,
description: 'Build helper git-credential-wincred. Requires Windows SDK.')
option('curl', type: 'feature', value: 'enabled',
description: 'Build helpers used to access remotes with the HTTP transport.')
option('expat', type: 'feature', value: 'enabled',
Expand Down
Loading