diff options
| -rwxr-xr-x | .ci/azure-pipelines/build_linux.bash | 2 | ||||
| -rwxr-xr-x | .ci/azure-pipelines/build_macos.bash | 4 | ||||
| -rw-r--r-- | .ci/azure-pipelines/build_windows.bat | 3 | ||||
| -rwxr-xr-x | .ci/travis-ci/script.bash | 11 |
4 files changed, 14 insertions, 6 deletions
diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index 2af11f9bf..a4ca8a8e7 100755 --- a/.ci/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash @@ -18,7 +18,7 @@ VER=$(python scripts/mumble-version.py) cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=appdir/usr -Dtests=ON Donline-tests=ON -Dversion=$VER -Dsymbols=ON \ - -Donline-tests=ON -Dgrpc=ON $BUILD_SOURCESDIRECTORY + -Donline-tests=ON -Dgrpc=ON -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY cmake --build . ctest --verbose diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index 95d1799c6..e46ab121c 100755 --- a/.ci/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash @@ -18,7 +18,9 @@ VER=$(python scripts/mumble-version.py) cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" \ - -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON $BUILD_SOURCESDIRECTORY + -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON \ + -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY + cmake --build . ctest --verbose diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index da7e437e6..6e4a3d66c 100644 --- a/.ci/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat @@ -51,7 +51,8 @@ del C:\Strawberry\c\bin\c++.exe cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%MUMBLE_ENVIRONMENT_TRIPLET% ^ -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\%MUMBLE_ENVIRONMENT_TRIPLET%" -DCMAKE_BUILD_TYPE=Release -Dtests=ON ^ - -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON -Donline-tests=ON -Dgrpc=ON "%BUILD_SOURCESDIRECTORY%" + -Dversion=%VER% -Dpackaging=ON -Dstatic=ON -Dsymbols=ON -Dasio=ON -Dg15=ON -Donline-tests=ON -Dgrpc=ON ^ + -Ddisplay-install-paths=ON "%BUILD_SOURCESDIRECTORY%" if errorlevel 1 ( exit /b %errorlevel% diff --git a/.ci/travis-ci/script.bash b/.ci/travis-ci/script.bash index 0c68f2fd0..a67abbf98 100755 --- a/.ci/travis-ci/script.bash +++ b/.ci/travis-ci/script.bash @@ -16,7 +16,9 @@ VER=$(python scripts/mumble-version.py) if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${MUMBLE_HOST}" == "aarch64-linux-gnu" ]; then mkdir build && cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON .. + + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON -Ddisplay-install-paths=ON .. + cmake --build . # We don't execute tests on ARM64 because TestPacketDataStream fails. # See https://github.com/mumble-voip/mumble/issues/3845. @@ -24,8 +26,11 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo cmake --install . elif [ "${MUMBLE_HOST}" == "x86_64-linux-gnu" ]; then mkdir build && cd build + # We specify the absolute path because otherwise Travis CI's CMake is used. - /usr/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON .. + /usr/bin/cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dsymbols=ON -Donline-tests=ON -Dgrpc=ON \ + -Ddisplay-install-paths=ON .. + /usr/bin/cmake --build . /usr/bin/ctest --verbose sudo /usr/bin/cmake --install . @@ -39,7 +44,7 @@ if [ "${TRAVIS_OS_NAME}" == "linux" ]; then PATH=$PATH:/usr/lib/mxe/usr/bin ${MUMBLE_HOST}.static-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -Dtests=ON -Dversion=$VER -Dstatic=ON -Dsymbols=ON -Dasio=ON \ - -Dzeroconf=OFF -Dice=OFF -Doverlay=OFF -Donline-tests=ON .. + -Dzeroconf=OFF -Dice=OFF -Doverlay=OFF -Donline-tests=ON -Ddisplay-install-paths=ON .. cmake --build . # TODO: investigate why tests fail. #ctest |