diff --git a/doc/changelog.dox b/doc/changelog.dox index 2db8ddfe6..a039e463a 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -411,6 +411,8 @@ See also: - Various compiler warning fixes (see [mosra/magnum#406](https://github.com/mosra/magnum/pull/406)) - Added a 32-bit Windows build to the CI matrix to avoid random compilation issues (see [mosra/magnum#421](https://github.com/mosra/magnum/issues/421)) +- The library again compiles and tests cleanly with @ref CORRADE_NO_ASSERT + enabled, and this setup is verified on the CI to avoid further regressions @subsection changelog-latest-bugfixes Bug fixes diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index f4355aac5..553989a3c 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -9,9 +9,9 @@ cmake .. \ -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ - -DCMAKE_BUILD_TYPE=Debug \ -DBUILD_DEPRECATED=$BUILD_DEPRECATED \ -DBUILD_STATIC=$BUILD_STATIC \ + -DCMAKE_BUILD_TYPE=$CONFIGURATION \ -DWITH_INTERCONNECT=OFF \ -G Ninja ninja install @@ -22,7 +22,7 @@ mkdir build && cd build cmake .. \ -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=$CONFIGURATION \ -DWITH_AUDIO=ON \ -DWITH_VK=OFF \ -DWITH_GLFWAPPLICATION=ON \ diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 1ad1f7dfb..e40c7ef67 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -20,6 +20,7 @@ matrix: - TARGET=desktop - CMAKE_CXX_FLAGS="--coverage" - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" + - CONFIGURATION=Debug - language: cpp os: linux dist: xenial @@ -28,6 +29,8 @@ matrix: - JOBID=linux-nondeprecated - TARGET=desktop - BUILD_DEPRECATED=OFF + - CMAKE_CXX_FLAGS="-DCORRADE_NO_ASSERT" + - CONFIGURATION=Release - language: cpp os: linux dist: xenial @@ -36,6 +39,7 @@ matrix: - JOBID=linux-sanitizers - TARGET=desktop-sanitizers - CMAKE_CXX_FLAGS=-fsanitize=address + - CONFIGURATION=Debug addons: apt: sources: @@ -55,6 +59,7 @@ matrix: - JOBID=linux-threadsanitizer - TARGET=desktop-sanitizers - CMAKE_CXX_FLAGS=-fsanitize=thread + - CONFIGURATION=Debug addons: apt: sources: @@ -91,6 +96,7 @@ matrix: - CMAKE_CXX_FLAGS="--coverage" - LCOV_EXTRA_OPTS="--gcov-tool /usr/bin/gcov-4.8" - BUILD_STATIC=ON + - CONFIGURATION=Debug - language: cpp os: linux dist: xenial @@ -128,6 +134,7 @@ matrix: - JOBID=macos-gl - TARGET=desktop - CMAKE_CXX_FLAGS="--coverage" + - CONFIGURATION=Debug - language: cpp os: osx # See above @@ -138,6 +145,7 @@ matrix: - TARGET=desktop - CMAKE_CXX_FLAGS="--coverage" - BUILD_STATIC=ON + - CONFIGURATION=Debug - language: cpp os: osx osx_image: xcode7.3