diff options
| -rw-r--r-- | bin/meson.build | 21 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/meson.build | 6 |
3 files changed, 26 insertions, 2 deletions
diff --git a/bin/meson.build b/bin/meson.build new file mode 100644 index 00000000000..b8b44baf7d0 --- /dev/null +++ b/bin/meson.build @@ -0,0 +1,21 @@ +# Copyright © 2017 Eric Engestrom + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +git_sha1_gen_py = files('git_sha1_gen.py') diff --git a/meson.build b/meson.build index 49a0ef6d405..875f9d4d294 100644 --- a/meson.build +++ b/meson.build @@ -843,4 +843,5 @@ endif pkg = import('pkgconfig') subdir('include') +subdir('bin') subdir('src') diff --git a/src/meson.build b/src/meson.build index 9b1b0ae594d..f980d25b7dd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -34,9 +34,11 @@ libglsl_util = static_library( build_by_default : false, ) -sha1_h = vcs_tag( - input : 'git_sha1.h.in', +sha1_h = custom_target( + 'git_sha1.h', output : 'git_sha1.h', + command : [prog_python2, git_sha1_gen_py, '--output', '@OUTPUT@'], + build_always : true, # commit sha1 can change without having touched these files ) subdir('gtest') |