From ec9302c4ed12e469401bcb54c90575b1bc9d8bb6 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Mon, 4 Nov 2019 01:13:59 -0800 Subject: [PATCH] Avoid deprecated Meson feature * https://mesonbuild.com/Python-3-module.html > This module is deprecated and replaced by the python module. --- .travis_scripts/meson_builder.sh | 2 +- meson.build | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis_scripts/meson_builder.sh b/.travis_scripts/meson_builder.sh index 0820c89..1fdd8f6 100755 --- a/.travis_scripts/meson_builder.sh +++ b/.travis_scripts/meson_builder.sh @@ -65,7 +65,7 @@ _COMPILER_NAME=`basename ${CXX}` _BUILD_DIR_NAME="build-${BUILD_TYPE}_${LIB_TYPE}_${_COMPILER_NAME}" ./.travis_scripts/run-clang-format.sh -meson --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . "${_BUILD_DIR_NAME}" +meson --fatal-meson-warnings --werror --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . "${_BUILD_DIR_NAME}" ninja -v -j 2 -C "${_BUILD_DIR_NAME}" cd "${_BUILD_DIR_NAME}" diff --git a/meson.build b/meson.build index b2560af..aa50d8f 100644 --- a/meson.build +++ b/meson.build @@ -71,8 +71,7 @@ jsoncpp_dep = declare_dependency( ) # tests -#python = import('python3').find_python() -python = find_program('python3', 'python') +python = import('python').find_installation() jsoncpp_test = executable( 'jsoncpp_test',