diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-23 21:00:58 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-08-23 21:00:58 -0400 |
| commit | 9c886f20b97b6ab1ac85b849f1fe7f16eb199ff0 (patch) | |
| tree | 7376c651ff0c75daf64bbc086858239a1d51f50b /include/wlr/meson.build | |
| parent | dea311992eb4ff3e343c3cf5b0603034223d2a42 (diff) | |
Revert "Merge pull request #1194 from ascent12/meson_feature"
This breaks wlroots when used as a meson subproject.
This reverts commit dea311992eb4ff3e343c3cf5b0603034223d2a42, reversing
changes made to 6db9c4b74667c1d917d720f5e96985a2461569fb.
Diffstat (limited to 'include/wlr/meson.build')
| -rw-r--r-- | include/wlr/meson.build | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/include/wlr/meson.build b/include/wlr/meson.build index 43b5aec9..6259c311 100644 --- a/include/wlr/meson.build +++ b/include/wlr/meson.build @@ -4,23 +4,11 @@ version_data.set_quoted('WLR_VERSION_STR', meson.project_version()) version_data.set('WLR_VERSION_MAJOR', version_array[0]) version_data.set('WLR_VERSION_MINOR', version_array[1]) version_data.set('WLR_VERSION_MICRO', version_array[2]) +version_data.set('WLR_VERSION_NUM', '(WLR_VERSION_MAJOR << 16) | (WLR_VERSION_MINOR << 8) | WLR_VERSION_MICRO') version_data.set('WLR_VERSION_API_CURRENT', so_version[0]) version_data.set('WLR_VERSION_API_REVISION', so_version[1]) version_data.set('WLR_VERSION_API_AGE', so_version[2]) -install_headers( - configure_file(input: 'config.h.in', output: 'config.h',configuration: conf_data), - configure_file(input: 'version.h.in', output: 'version.h', configuration: version_data), - 'backend.h', - 'xcursor.h', - subdir: 'wlr' -) -if conf_data.get('WLR_HAS_XWAYLAND', false) - install_headers('xwayland.h', subdir: 'wlr') -endif - -subdir('backend') -subdir('interfaces') -subdir('render') -subdir('types') -subdir('util') +wlr_inc_dest = join_paths(get_option('includedir'), 'wlr') +configure_file(output: 'config.h', install_dir: wlr_inc_dest, configuration: conf_data) +configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data) |