diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-06-23 15:03:06 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-06-23 15:57:23 +0200 |
| commit | d4fe79ec163186ac8d8d165449f2869b2165df65 (patch) | |
| tree | 7daab3fab9a10635c82be85d1f691a21c5031258 | |
| parent | 71c9c0b0a6ffbb837bbdb9513e949e69e1b09296 (diff) | |
AppVeyor/Travis: Omit features instead of explicitly disabling (OFF)
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | appveyor.yml | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index af630b539e..701a087e60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,8 +73,8 @@ jobs: compiler: gcc cache: ccache # Ubuntu Bionic build prerequisites - # TODO for Ubuntu Focal: "-DFAAD=OFF -DFFMPEG=ON" - env: CMAKEFLAGS_EXTRA="-DFAAD=ON -DFFMPEG=OFF -DHSS1394=OFF -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON" + # TODO for Ubuntu Focal: Replace "-DFAAD=ON" with "-DFFMPEG=ON" + env: CMAKEFLAGS_EXTRA="-DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON" before_install: - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" - export CTEST_PARALLEL_LEVEL="$(nproc)" @@ -173,7 +173,7 @@ jobs: - ccache env: >- MIXXX_ENVPATH="${HOME}/buildenv" - CMAKEFLAGS_EXTRA="-DCOREAUDIO=ON -DFAAD=OFF -DFFMPEG=OFF -DHSS1394=ON -DLOCALECOMPARE=OFF -DMAD=OFF -DMODPLUG=OFF -DWAVPACK=OFF" + CMAKEFLAGS_EXTRA="-DCOREAUDIO=ON -DHSS1394=ON" PATH="/usr/local/opt/ccache/bin:$PATH" DISPLAY=:99.0 CMAKE_BUILD_PARALLEL_LEVEL=4 diff --git a/appveyor.yml b/appveyor.yml index 5d49053851..95eadc2fef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -114,10 +114,8 @@ for: -DBATTERY=ON -DBROADCAST=ON -DBULK=ON - -DFAAD=OFF -DFFMPEG=ON -DHID=ON - -DHSS1394=OFF -DLILV=ON -DLOCALECOMPARE=ON -DMAD=ON @@ -222,19 +220,14 @@ for: -DBATTERY=ON -DBROADCAST=ON -DBULK=ON - -DFAAD=OFF - -DFFMPEG=OFF -DHID=ON -DHSS1394=ON - -DLILV=OFF -DLOCALECOMPARE=ON -DMAD=ON -DMEDIAFOUNDATION=ON - -DMODPLUG=OFF -DOPUS=ON -DQTKEYCHAIN=ON -DVINYLCONTROL=ON - -DWAVPACK=OFF -DSTATIC_DEPS=ON -G "Ninja" .. |