fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-25 23:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename version.h to libweston/version.h

Browse source 
This is an installed public header, and without the subdir would surely
conflict with something else.

include/libweston/meson.build is necessary for putting the generated header in
the right subdirectory so that '#include <libweston/version.h>' can work.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-04-04 15:41:02 +03:00
parent eebb7dc9ce
commit cda1488ce0
5 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compositor/main.c
View file

@ -52,7 +52,7 @@
#include "../shared/helpers.h" #include "../shared/helpers.h"
#include "../shared/string-helpers.h" #include "../shared/string-helpers.h"
#include "git-version.h" #include "git-version.h"
#include "version.h" #include <libweston/version.h>
#include "weston.h" #include "weston.h"
#include <libweston/backend-drm.h> #include <libweston/backend-drm.h>

12
include/libweston/meson.build
View file

@ -17,3 +17,15 @@ backend_wayland_h = files('backend-wayland.h')
backend_x11_h = files('backend-x11.h') backend_x11_h = files('backend-x11.h')
xwayland_api_h = files('xwayland-api.h') xwayland_api_h = files('xwayland-api.h')
libweston_version_h = configuration_data()
libweston_version_h.set('WESTON_VERSION_MAJOR', version_weston_arr[0])
libweston_version_h.set('WESTON_VERSION_MINOR', version_weston_arr[1])
libweston_version_h.set('WESTON_VERSION_MICRO', version_weston_arr[2])
libweston_version_h.set('WESTON_VERSION', version_weston)
version_h = configure_file(
input: 'version.h.in',
output: 'version.h',
configuration: libweston_version_h
)
install_headers(version_h, subdir: dir_include_libweston_install)

0
libweston/version.h.in → include/libweston/version.h.in
View file

2
libweston/compositor.c
View file

@ -68,7 +68,7 @@
#include "shared/string-helpers.h" #include "shared/string-helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "git-version.h" #include "git-version.h"
#include "version.h" #include <libweston/version.h>
#include <libweston/plugin-registry.h> #include <libweston/plugin-registry.h>
#include "pixel-formats.h" #include "pixel-formats.h"

11
meson.build
View file

@ -45,17 +45,6 @@ public_inc = include_directories('include')
pkgconfig = import('pkgconfig') pkgconfig = import('pkgconfig')
libweston_version_h = configuration_data()
libweston_version_h.set('WESTON_VERSION_MAJOR', version_weston_arr[0])
libweston_version_h.set('WESTON_VERSION_MINOR', version_weston_arr[1])
libweston_version_h.set('WESTON_VERSION_MICRO', version_weston_arr[2])
libweston_version_h.set('WESTON_VERSION', version_weston)
version_h = configure_file(
input: 'libweston/version.h.in',
output: 'version.h',
configuration: libweston_version_h
)
install_headers(version_h, subdir: dir_include_libweston)
git_version_h = vcs_tag( git_version_h = vcs_tag(
input: 'libweston/git-version.h.meson', input: 'libweston/git-version.h.meson',
output: 'git-version.h', output: 'git-version.h',