diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-01 21:20:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-06-01 21:20:34 +0200 |
| commit | 7075aad33a4c16273519bbe69f553b941be70f08 (patch) | |
| tree | fd5c55e1a9acd9e516f2c752894bf1dc6c84f5ba /.circleci | |
| parent | 1083e89da3f8182d377a48d0c46cf2308795f974 (diff) | |
CI: Normalize setting cmake variables and invoking cmake acoss all ci setups
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b36ba9453f..a913237a772 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,14 +56,14 @@ jobs: - run: name: Setup command: | - mkdir bin - cd bin + export CFLAGS="-Werror" + export CXXFLAGS="-Werror" if [ "$DOCKERHUB_PUSH_IMAGES" == "TRUE" ]; then - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 + export CMAKE_BUILD_TYPE=Release else - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=static -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 + export CMAKE_BUILD_TYPE=Debug fi - cd .. + 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=check_install -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib -DBUILD_TESTING=1 - run: name: Build command: | @@ -128,6 +128,9 @@ 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 export PATH=/usr/lib/ccache:$PATH @@ -136,10 +139,7 @@ jobs: ccache -s git config user.email "circleci@build.bot" && git config user.name "Circle CI" $CXX --version - mkdir bin - cd bin - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=0 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install - cd .. + 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=check_install - run: name: Build command: | |