summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2020-01-14 11:37:11 +0000
committerGitHub <noreply@github.com>2020-01-14 11:37:11 +0000
commit68371fb802a1be80187bd6a0ccb5250276da5a3b (patch)
tree8f11300ce1a7c589fdef39cd22ba49d82619ffee
parent5d818164dd2ab87b0054641f1446bc552a602320 (diff)
parent1c650934169a9663f76576d7430da0599e365e3e (diff)
downloadlibepoxy-68371fb802a1be80187bd6a0ccb5250276da5a3b.tar.gz
Merge pull request #216 from anholt/gen-find-program
build: Use find_program()
-rw-r--r--.travis.yml1
-rw-r--r--meson.build2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 52c043e..0fe6610 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ before_install:
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
brew update
+ brew unlink python@2
brew install python@3 meson
# Use a Ninja with QuLogic's patch: https://github.com/ninja-build/ninja/issues/1219
mkdir -p $HOME/tools; curl -L http://nirbheek.in/files/binaries/ninja/macos/ninja -o $HOME/tools/ninja; chmod +x $HOME/tools/ninja
diff --git a/meson.build b/meson.build
index 029798c..47d3997 100644
--- a/meson.build
+++ b/meson.build
@@ -197,7 +197,7 @@ if host_system == 'windows'
endif
# Generates the dispatch tables
-gen_dispatch_py = files('src/gen_dispatch.py')
+gen_dispatch_py = find_program('src/gen_dispatch.py')
gl_registry = files('registry/gl.xml')
egl_registry = files('registry/egl.xml')