Merge Aaron Laws's 'unneeded-build-flag' into unstable

This commit is contained in:
John Ralls 2017-11-28 15:16:36 -08:00
commit a5bf4e00a4
3 changed files with 1 additions and 3 deletions

View File

@ -4,7 +4,6 @@ language: c++
compiler: gcc
env:
- BUILDENV=arch BUILDTYPE=cmake-ninja
- BUILDENV=arch BUILDTYPE=autotools
- BUILDENV=ubuntu-14.04 BUILDTYPE=cmake-make
- BUILDENV=ubuntu-14.04 BUILDTYPE=autotools
services:

View File

@ -58,7 +58,6 @@ OPTION (WITH_GNUCASH "Build all of GnuCash, not just the library" ON)
OPTION (WITH_OFX "compile with ofx support (needs LibOFX)" ON)
OPTION (WITH_PYTHON "enable python plugin and bindings" OFF)
OPTION (ENABLE_BINRELOC "compile with binary relocation support" ON)
OPTION (ENABLE_DEBUG "compile with debugging flags set" OFF)
OPTION (ENABLE_REGISTER2 "compile with register2 enabled" OFF)
OPTION (DISABLE_NLS "do not use Native Language Support" OFF)
OPTION (DISABLE_DEPRECATED_GLIB "don't use deprecated glib functions" OFF)

View File

@ -11,7 +11,7 @@ if [[ "$BUILDTYPE" == "cmake-make" ]]; then
make -j 4
make check || ../afterfailure
elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -DENABLE_DEBUG=on -G Ninja
cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja
ninja
ninja check || ../afterfailure;
elif [[ "$BUILDTYPE" == "autotools" ]]; then