From 036b51de68fad46cfe6184470643c7725fabaa36 Mon Sep 17 00:00:00 2001 From: Kyle Gerheiser <3209794+kgerheiser@users.noreply.github.com> Date: Thu, 27 Aug 2020 12:21:56 -0400 Subject: [PATCH 1/2] gcc-10-settable-flags --- src/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f875f5..b27e450 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,12 +1,16 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") set(CMAKE_Fortran_FLAGS - "-g -traceback -free -xHOST -convert big_endian -assume byterecl") + "-g -traceback -free -xHOST -convert big_endian -assume byterecl ${CMAKE_Fortran_FLAGS}") elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$") - set(CMAKE_Fortran_FLAGS "-g -fbacktrace -fconvert=big-endian -ffree-form") + set(CMAKE_Fortran_FLAGS "-g -fbacktrace -fconvert=big-endian -ffree-form ${CMAKE_Fortran_FLAGS}") set(CMAKE_Fortran_RELEASE "-O2") endif() +if(${CMAKE_Fortran_COMPILER_ID} MATCHES "^(GNU)$" AND ${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -fallow-argument-mismatch -fallow-invalid-boz") +endif() + set(fortran_src gfsio_module.f) set(lib_name ${PROJECT_NAME}) From 0dda594f0080334af34c9c4eff40cc96c3fcbf22 Mon Sep 17 00:00:00 2001 From: Kyle Gerheiser <3209794+kgerheiser@users.noreply.github.com> Date: Thu, 27 Aug 2020 13:15:50 -0400 Subject: [PATCH 2/2] Remove -xHOST and fix compiler check --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b27e450..7051443 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,8 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$") set(CMAKE_Fortran_FLAGS - "-g -traceback -free -xHOST -convert big_endian -assume byterecl ${CMAKE_Fortran_FLAGS}") -elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$") + "-g -traceback -free -convert big_endian -assume byterecl ${CMAKE_Fortran_FLAGS}") +elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") set(CMAKE_Fortran_FLAGS "-g -fbacktrace -fconvert=big-endian -ffree-form ${CMAKE_Fortran_FLAGS}") set(CMAKE_Fortran_RELEASE "-O2") endif()