mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Don't search for python3 twice

Browse source
This commit is contained in:
Nirbheek Chauhan 2016-12-16 23:45:08 +05:30
parent 6354b57295
commit 4d179024f0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/parse/meson.build
View file

@ -1,11 +1,5 @@
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
py3 = find_program('python3', required : false)
if not py3.found()
# Maybe 'python' is Python 3
py3 = find_program('python')
endif
# Find flex, configure lex generator # Find flex, configure lex generator
flex_cdata = configuration_data() flex_cdata = configuration_data()

10
meson.build
View file

@ -364,6 +364,13 @@ if libtype == 'static'
gst_c_args += ['-DGST_STATIC_COMPILATION'] gst_c_args += ['-DGST_STATIC_COMPILATION']
endif endif
# Used in gst/parse/meson.build and below
py3 = find_program('python3', required : false)
if not py3.found()
# Maybe 'python' is Python 3
py3 = find_program('python')
endif
subdir('gst') subdir('gst')
subdir('libs') subdir('libs')
subdir('plugins') subdir('plugins')
@ -384,5 +391,4 @@ else
endif endif
endif endif
python3 = find_program('python3') run_command(py3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')