From 796f4e8ce5be5bac90b60ffde69f1ba502cf4111 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Thu, 28 Nov 2024 12:58:40 +0100 Subject: [PATCH 1/4] More finely graded Warnings --- CMakeLists.txt | 5 ++++- src/CMakeLists.txt | 24 +++++++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c6892ea90..a0a090af11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,10 @@ project( T8CODE include( CTest ) option( T8CODE_BUILD_AS_SHARED_LIBRARY "Whether t8code should be built as a shared or a static library" ON ) -option( T8CODE_BUILD_PEDANTIC "Compile t8code with `-Wall -pedantic -Werror` as done in the Github CI." OFF ) +option( T8CODE_BUILD_PEDANTIC "Compile t8code with `-pedantic` as done in the Github CI." OFF ) +option( T8CODE_BUILD_WALL "Compile t8code with `-Wall` as done in the Github CI." OFF ) +option( T8CODE_BUILD_WERROR "Compile t8code with `-Werror` as done in the Github CI." OFF ) +option( T8CODE_BUILD_EXTRA_WARNINGS "Compile t8code with extra warnings as done in the Github CI." OFF ) option( T8CODE_EXPORT_COMPILE_COMMANDS "Export the compile commands as json. Can be used by IDEs for code completion (e.g. intellisense, clangd)" OFF ) option( T8CODE_BUILD_TESTS "Build t8code's automated tests" ON ) option( T8CODE_BUILD_TUTORIALS "Build t8code's tutorials" ON ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 899c014f74..09b78539ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -71,9 +71,27 @@ endif() if( T8CODE_BUILD_PEDANTIC ) # TODO: Add `-Wextra -Wpedantic`. As of now, t8code would not compile with this. # See also: https://github.com/DLR-AMR/t8code/issues/1155. - target_compile_options( T8 PUBLIC -Wall -pedantic -Werror ) - set (T8_CXXFLAGS "${T8_CXXFLAGS} -W -Wall -Wpedantic -Werror") - set (T8_CFLAGS "${T8_CFLAGS} -W -Wall -Wpedantic -Werror") + target_compile_options( T8 PUBLIC -pedantic ) + set (T8_CXXFLAGS "${T8_CXXFLAGS} -Wpedantic") + set (T8_CFLAGS "${T8_CFLAGS} -Wpedantic") +endif() + +if( T8CODE_BUILD_WALL) + target_compile_options( T8 PUBLIC -Wall ) + set (T8_CXXFLAGS "${T8_CXXFLAGS} -Wall") + set (T8_CFLAGS "${T8_CFLAGS} -Wall") +endif() + +if( T8CODE_BUILD_WERROR ) + target_compile_options( T8 PUBLIC -Werror ) + set (T8_CXXFLAGS "${T8_CXXFLAGS} -Werror") + set (T8_CFLAGS "${T8_CFLAGS} -Werror") +endif() + +if( T8CODE_BUILD_WEXTRA ) + target_compile_options( T8 PUBLIC -Wextra ) + set (T8_CXXFLAGS "${T8_CXXFLAGS} -Wextra") + set (T8_CFLAGS "${T8_CFLAGS} -Wextra") endif() target_sources( T8 PRIVATE From b149c24dfe55ac5345002dd13c4480bb84a1fe81 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Thu, 28 Nov 2024 13:04:09 +0100 Subject: [PATCH 2/4] Update CI --- .github/workflows/build_cmake_tarball.yml | 4 ++-- .github/workflows/tests_cmake_t8code.yml | 2 +- .github/workflows/tests_cmake_t8code_api.yml | 2 +- .github/workflows/tests_cmake_t8code_linkage.yml | 2 +- .github/workflows/tests_cmake_t8code_w_shipped_submodules.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_cmake_tarball.yml b/.github/workflows/build_cmake_tarball.yml index 2f50850e86..2538845581 100644 --- a/.github/workflows/build_cmake_tarball.yml +++ b/.github/workflows/build_cmake_tarball.yml @@ -80,7 +80,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV - name: cmake run: mkdir build && cd build && cmake ../ $CONFIG_OPTIONS @@ -135,7 +135,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV - name: Check vars run: echo "[$CONFIG_DEBUG]" diff --git a/.github/workflows/tests_cmake_t8code.yml b/.github/workflows/tests_cmake_t8code.yml index 1effcaba77..9890ad491f 100644 --- a/.github/workflows/tests_cmake_t8code.yml +++ b/.github/workflows/tests_cmake_t8code.yml @@ -81,7 +81,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test - name: Printing MPI compiler info diff --git a/.github/workflows/tests_cmake_t8code_api.yml b/.github/workflows/tests_cmake_t8code_api.yml index 9cae2757f2..40e8f627ae 100644 --- a/.github/workflows/tests_cmake_t8code_api.yml +++ b/.github/workflows/tests_cmake_t8code_api.yml @@ -82,7 +82,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test with fortran - name: check fortran diff --git a/.github/workflows/tests_cmake_t8code_linkage.yml b/.github/workflows/tests_cmake_t8code_linkage.yml index 6e58ed8ffd..dc332418bc 100644 --- a/.github/workflows/tests_cmake_t8code_linkage.yml +++ b/.github/workflows/tests_cmake_t8code_linkage.yml @@ -82,7 +82,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test with netcdf - name: check NetCDF diff --git a/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml b/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml index 01f83aac5b..baff6629a4 100644 --- a/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml +++ b/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml @@ -78,7 +78,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test - name: Printing MPI compiler info From a4a23ebfaf2d4b049b4418300c295a4220c8f751 Mon Sep 17 00:00:00 2001 From: David Knapp Date: Thu, 28 Nov 2024 13:06:06 +0100 Subject: [PATCH 3/4] Delete old comment --- src/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 09b78539ff..225891a897 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,8 +69,6 @@ if( T8CODE_ENABLE_LESS_TESTS ) endif() if( T8CODE_BUILD_PEDANTIC ) - # TODO: Add `-Wextra -Wpedantic`. As of now, t8code would not compile with this. - # See also: https://github.com/DLR-AMR/t8code/issues/1155. target_compile_options( T8 PUBLIC -pedantic ) set (T8_CXXFLAGS "${T8_CXXFLAGS} -Wpedantic") set (T8_CFLAGS "${T8_CFLAGS} -Wpedantic") From e1a161ae5751b7c15a0d4e6384ebc812ef7983ef Mon Sep 17 00:00:00 2001 From: David Knapp Date: Thu, 28 Nov 2024 13:16:09 +0100 Subject: [PATCH 4/4] Remove wextra, because google-test-with-mpi does not fullfill werror --- .github/workflows/build_cmake_tarball.yml | 4 ++-- .github/workflows/tests_cmake_t8code.yml | 2 +- .github/workflows/tests_cmake_t8code_api.yml | 2 +- .github/workflows/tests_cmake_t8code_linkage.yml | 2 +- .../workflows/tests_cmake_t8code_w_shipped_submodules.yml | 2 +- src/CMakeLists.txt | 5 ----- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_cmake_tarball.yml b/.github/workflows/build_cmake_tarball.yml index 2538845581..2698294956 100644 --- a/.github/workflows/build_cmake_tarball.yml +++ b/.github/workflows/build_cmake_tarball.yml @@ -80,7 +80,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV - name: cmake run: mkdir build && cd build && cmake ../ $CONFIG_OPTIONS @@ -135,7 +135,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=OFF -DT8CODE_USE_SYSTEM_P4EST=OFF -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV - name: Check vars run: echo "[$CONFIG_DEBUG]" diff --git a/.github/workflows/tests_cmake_t8code.yml b/.github/workflows/tests_cmake_t8code.yml index 9890ad491f..a4387954a8 100644 --- a/.github/workflows/tests_cmake_t8code.yml +++ b/.github/workflows/tests_cmake_t8code.yml @@ -81,7 +81,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test - name: Printing MPI compiler info diff --git a/.github/workflows/tests_cmake_t8code_api.yml b/.github/workflows/tests_cmake_t8code_api.yml index 40e8f627ae..06fd00fcc3 100644 --- a/.github/workflows/tests_cmake_t8code_api.yml +++ b/.github/workflows/tests_cmake_t8code_api.yml @@ -82,7 +82,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test with fortran - name: check fortran diff --git a/.github/workflows/tests_cmake_t8code_linkage.yml b/.github/workflows/tests_cmake_t8code_linkage.yml index dc332418bc..06ef5cdb59 100644 --- a/.github/workflows/tests_cmake_t8code_linkage.yml +++ b/.github/workflows/tests_cmake_t8code_linkage.yml @@ -82,7 +82,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_USE_SYSTEM_SC=ON -DT8CODE_USE_SYSTEM_P4EST=ON -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSC_DIR=$SC_PATH/install/cmake -DP4EST_DIR=$P4EST_PATH/install/cmake" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test with netcdf - name: check NetCDF diff --git a/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml b/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml index baff6629a4..7d5ffb433e 100644 --- a/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml +++ b/.github/workflows/tests_cmake_t8code_w_shipped_submodules.yml @@ -78,7 +78,7 @@ jobs: run: export LESS_TEST_OPTION="-DT8CODE_ENABLE_LESS_TESTS=ON" && echo LESS_TEST_OPTION="$LESS_TEST_OPTION" >> $GITHUB_ENV - name: build config variables - run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_BUILD_WEXTRA=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" + run: export CONFIG_OPTIONS="${LESS_TEST_OPTION} -GNinja -DT8CODE_BUILD_PEDANTIC=ON -DT8CODE_BUILD_WALL=ON -DT8CODE_BUILD_WERROR=ON -DT8CODE_ENABLE_MPI=$MPI -DCMAKE_BUILD_TYPE=$BUILD_TYPE" && echo CONFIG_OPTIONS="$CONFIG_OPTIONS" >> $GITHUB_ENV # cmake and test - name: Printing MPI compiler info diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 225891a897..f1ce5d072f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -86,11 +86,6 @@ if( T8CODE_BUILD_WERROR ) set (T8_CFLAGS "${T8_CFLAGS} -Werror") endif() -if( T8CODE_BUILD_WEXTRA ) - target_compile_options( T8 PUBLIC -Wextra ) - set (T8_CXXFLAGS "${T8_CXXFLAGS} -Wextra") - set (T8_CFLAGS "${T8_CFLAGS} -Wextra") -endif() target_sources( T8 PRIVATE t8.c