From d70cc88dab11bc6d1095523a0ce655dff40b27a2 Mon Sep 17 00:00:00 2001
From: memchr <118117622+memchr@users.noreply.github.com>
Date: Wed, 18 Oct 2023 23:09:06 +0000
Subject: [PATCH] meson: generate version.h before install_headers (#3612)
Otherwise, meson install would not install version.h as a header in a
clean build.
---
meson.build | 4 ++--
nix/patches/meson-build.patch | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index 1d2c7f9f..de29528e 100644
--- a/meson.build
+++ b/meson.build
@@ -69,14 +69,14 @@ if get_option('buildtype') == 'debug'
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
endif
+version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
+
globber = run_command('find', 'src', '-name', '*.h*', check: true)
headers = globber.stdout().strip().split('\n')
foreach file : headers
install_headers(file, subdir: 'hyprland', preserve_path: true)
endforeach
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
-
subdir('protocols')
subdir('src')
subdir('hyprctl')
diff --git a/nix/patches/meson-build.patch b/nix/patches/meson-build.patch
index b8f784e9..844eacae 100644
--- a/nix/patches/meson-build.patch
+++ b/nix/patches/meson-build.patch
@@ -24,15 +24,15 @@ index 1d2c7f9f..c5ef4e67 100644
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
endif
-@@ -75,8 +62,6 @@ foreach file : headers
- install_headers(file, subdir: 'hyprland', preserve_path: true)
- endforeach
+@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
+ add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
+ endif
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
-
- subdir('protocols')
- subdir('src')
- subdir('hyprctl')
+ globber = run_command('find', 'src', '-name', '*.h*', check: true)
+ headers = globber.stdout().strip().split('\n')
+ foreach file : headers
diff --git a/src/meson.build b/src/meson.build
index 0af864b9..38723b8c 100644
--- a/src/meson.build