Skip to content

Commit 6cca110

Browse files
committed
correct compiler options
1 parent 6504368 commit 6cca110

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/ci_cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626

2727
macos:
2828
env:
29-
CC: gcc-10
30-
FC: gfortran-10
29+
CC: gcc-11
30+
FC: gfortran-11
3131
runs-on: macos-latest
3232
steps:
3333
- uses: actions/checkout@v2

cmake/compilers.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if(NOT abi_ok)
66
if(abi_ok)
77
message(CHECK_PASS "OK")
88
else()
9-
message(FATAL ERROR "C compiler {CMAKE_C_COMPILER_ID} {CMAKE_C_COMPILER_VERSION} and Fortran compiler ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} are ABI-incompatible.")
9+
message(FATAL_ERROR "C compiler ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} and Fortran compiler ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} are ABI-incompatible.")
1010
endif()
1111
endif()
1212

@@ -16,7 +16,5 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
1616
# this helps show the options are/aren't conflicting between C and Fortran
1717
# at build time
1818
string(APPEND CMAKE_Fortran_FLAGS -fimplicit-none)
19-
add_compile_options(-Wextra)
19+
add_compile_options(-Wextra -Wall)
2020
endif()
21-
22-
add_compile_options(-Wall)

0 commit comments

Comments
 (0)