CI: Migrate compile flags environment variables to new cmake option WITH_WARNINGS_AS_ERRORS

(cherry picked from commit 4d59558c56)
This commit is contained in:
Shauren
2024-09-20 13:34:53 +02:00
committed by Ovahlord
parent 70d2b3b34d
commit f580ac2cde
5 changed files with 6 additions and 18 deletions

View File

@@ -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: |

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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: |

View File

@@ -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