diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-12-13 12:41:07 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-12-13 12:41:07 +0100 |
| commit | 560815e5161a4050f90fd5b77a743b00efd14f2a (patch) | |
| tree | 2ee9cc8b8664fd9efe289e4e9abfc52c35a247a6 /.travis.yml | |
| parent | 82ac066f356aabe17c65dac0137dad2b903ff954 (diff) | |
.travis.yml: Use shorter name from CMake flags env variable
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b7fe0067d0..1d8e424a80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: # For SCons builds - SCONSFLAGS="test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" # For CMake builds - - CMAKE_MIXXX_COMMON_FLAGS="-DMAD=ON -DFAAD=ON -DOPUS=ON -DMODPLUG=ON -DWAVPACK=ON -DHSS1394=OFF" + - CMAKEFLAGS="-DMAD=ON -DFAAD=ON -DOPUS=ON -DMODPLUG=ON -DWAVPACK=ON -DHSS1394=OFF" - GTEST_COLOR=1 - CTEST_OUTPUT_ON_FAILURE=1 @@ -53,7 +53,7 @@ jobs: compiler: gcc cache: ccache # Ubuntu Xenial build prerequisites - env: CMAKE_MIXXX_EXTRA_FLAGS="-DLOCALECOMPARE=ON" + env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON" before_install: - sudo apt-get install -y cmake - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" @@ -62,7 +62,7 @@ jobs: install: - mkdir cmake_build - cd cmake_build - - cmake -L $CMAKE_MIXXX_COMMON_FLAGS $CMAKE_MIXXX_EXTRA_FLAGS .. + - cmake -L $CMAKEFLAGS $CMAKEFLAGS_EXTRA .. - cmake --build . - sudo cmake --build . --target install script: @@ -114,7 +114,7 @@ jobs: # instead of <opus/opus_multistream.h>. # Virtual X (Xvfb) is needed for analyzer waveform tests env: >- - CMAKE_MIXXX_EXTRA_FLAGS="-DLOCALECOMPARE=OFF -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/" + CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=OFF -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/" DISPLAY=:99.0 before_install: - export CMAKE_BUILD_PARALLEL_LEVEL="$(sysctl -n hw.ncpu)" @@ -125,7 +125,7 @@ jobs: install: - mkdir cmake_build - cd cmake_build - - cmake -L $CMAKE_MIXXX_COMMON_FLAGS $CMAKE_MIXXX_EXTRA_FLAGS .. + - cmake -L $CMAKEFLAGS $CMAKEFLAGS_EXTRA .. - cmake --build . - sudo cmake --build . --target install script: |