From dff66aa91c7a56cd226baeb44eb0b9310dbf4db3 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 22 Aug 2023 17:05:54 +0200 Subject: [PATCH] Meson: Get rid of from-git subdir call --- meson.build | 4 +++- meson/from-git/meson.build | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 meson/from-git/meson.build diff --git a/meson.build b/meson.build index f98c4c4c77..26e7707d7c 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,9 @@ summary('Build Dir', product_build_dir, section: 'Build') # Setup some modules fs = import('fs') +# Check if we're running from a git checkout +from_git = fs.exists('.git') + # Create the configuration object and dependencies list. conf = configuration_data() @@ -64,7 +67,6 @@ subdir('meson' / 'auth-backend-unit-tests') # Auth Backend Unit Tests subdir('meson' / 'reproducible') # Reproducible Builds subdir('meson' / 'fuzz-targets') # Fuzzing Targets subdir('meson' / 'python') # Python -subdir('meson' / 'from-git') # From Git subdir('meson' / 'dlopen') # dlopen subdir('meson' / 'verbose-logging') # Verbose Logging subdir('meson' / 'pkcs11') # PKCS11 diff --git a/meson/from-git/meson.build b/meson/from-git/meson.build deleted file mode 100644 index 47650fadce..0000000000 --- a/meson/from-git/meson.build +++ /dev/null @@ -1 +0,0 @@ -from_git = fs.exists('.git') -- 2.47.2