diff options
| -rw-r--r-- | .circleci/config.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/gcc-build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/macos-arm-build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/win-x64-build.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
5 files changed, 6 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 35bf4d18df3..3c3e03c86ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,14 +56,12 @@ jobs: - run: name: Setup command: | - export CFLAGS="-Werror" - export CXXFLAGS="-Werror" if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then export CMAKE_BUILD_TYPE=Release else export CMAKE_BUILD_TYPE=Debug fi - cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 + cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 - run: name: Build command: | @@ -128,8 +126,6 @@ jobs: export CCACHE_MAXSIZE="1G" export CC="ccache clang" export CXX="ccache clang++" - export CFLAGS="-Werror" - export CXXFLAGS="-Werror" export CMAKE_BUILD_TYPE=Debug export CCACHE_CPP2=yes export USE_CCACHE=1 @@ -139,7 +135,7 @@ jobs: ccache -s git config user.email "circleci@build.bot" && git config user.name "Circle CI" $CXX --version - cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install + cmake -S . -B ./bin -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=bin/check_install - run: name: Build command: | diff --git a/.github/workflows/gcc-build.yml b/.github/workflows/gcc-build.yml index 2d51498a0dd..6f1765801cf 100644 --- a/.github/workflows/gcc-build.yml +++ b/.github/workflows/gcc-build.yml @@ -20,12 +20,10 @@ jobs: sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 --slave /usr/bin/g++ g++ /usr/bin/g++-11 - name: Setup env: - CFLAGS: -Werror - CXXFLAGS: -Werror CMAKE_BUILD_TYPE: Debug run: > cmake -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }} - -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 + -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DBUILD_TESTING=1 - name: Build diff --git a/.github/workflows/macos-arm-build.yml b/.github/workflows/macos-arm-build.yml index fb353fd5ba3..b6497abc81a 100644 --- a/.github/workflows/macos-arm-build.yml +++ b/.github/workflows/macos-arm-build.yml @@ -37,12 +37,10 @@ jobs: - name: Configure CMake env: - CFLAGS: -Werror - CXXFLAGS: -Werror CMAKE_BUILD_TYPE: Debug run: > cmake -GNinja -B ${{ steps.strings.outputs.build-output-dir }} - -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DBUILD_TESTING=1 + -DWITH_WARNINGS=1 -DWITH_WARNINGS_AS_ERRORS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DBUILD_TESTING=1 -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -S ${{ github.workspace }} diff --git a/.github/workflows/win-x64-build.yml b/.github/workflows/win-x64-build.yml index a4df60cb65f..5f63fd1b266 100644 --- a/.github/workflows/win-x64-build.yml +++ b/.github/workflows/win-x64-build.yml @@ -71,12 +71,10 @@ jobs: - name: Configure CMake env: - CFLAGS: /WX - CXXFLAGS: /WX BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: > cmake -GNinja -S ${{ github.workspace }} -B ${{ steps.strings.outputs.build-output-dir }} - -DTOOLS=ON + -DWITH_WARNINGS_AS_ERRORS=ON -DTOOLS=ON - name: Build run: | diff --git a/appveyor.yml b/appveyor.yml index 5f013678907..873026cb10c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,13 +7,11 @@ environment: BOOST_ROOT: C:\Libraries\boost_1_83_0 MYSQL_ROOT_DIR: C:\Program Files\MySQL\MySQL Server 8.0 OPENSSL_ROOT_DIR: C:\OpenSSL-v32-Win64 - CFLAGS: /WX - CXXFLAGS: /WX build_script: - cmd: >- git config user.email "appveyor@build.bot" && git config user.name "AppVeyor" - cmake -S . -B .\build -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DTOOLS=ON + cmake -S . -B .\build -G"Visual Studio 17 2022" -A x64 -DSCRIPTS=dynamic -DWITH_WARNINGS_AS_ERRORS=ON -DTOOLS=ON cd build |