Merge pull request #2128 from proller/fix16

Use ninja for package build
This commit is contained in:
alexey-milovidov 2018-03-28 05:25:24 +03:00 committed by GitHub
commit 72a62ab185
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

1
debian/control vendored
View File

@ -4,6 +4,7 @@ Priority: optional
Maintainer: Alexey Milovidov <milovidov@yandex-team.ru> Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
cmake3 | cmake, cmake3 | cmake,
ninja-build,
gcc-7, g++-7, gcc-7, g++-7,
libc6-dev, libc6-dev,
libmariadbclient-dev | default-libmysqlclient-dev | libmysqlclient-dev, libmariadbclient-dev | default-libmysqlclient-dev | libmysqlclient-dev,

2
debian/rules vendored
View File

@ -41,6 +41,8 @@ endif
endif endif
CMAKE_FLAGS += -DCMAKE_CXX_COMPILER=`which $(CXX)` -DCMAKE_C_COMPILER=`which $(CC)` CMAKE_FLAGS += -DCMAKE_CXX_COMPILER=`which $(CXX)` -DCMAKE_C_COMPILER=`which $(CC)`
CMAKE_FLAGS += -GNinja
export MAKE=ninja
ifndef DH_VERBOSE ifndef DH_VERBOSE
CMAKE_FLAGS += -DCMAKE_VERBOSE_MAKEFILE=0 CMAKE_FLAGS += -DCMAKE_VERBOSE_MAKEFILE=0