File tree 5 files changed +9
-17
lines changed
5 files changed +9
-17
lines changed Original file line number Diff line number Diff line change @@ -178,7 +178,7 @@ jobs:
178
178
cache_suffix : " ${{ matrix.build_type }}-${{ env.CACHE_SUFFIX }}"
179
179
recreate_cache : ${{ matrix.caching == false }}
180
180
dependencies : |
181
- ecmwf /ecbuild
181
+ awnawab /ecbuild@feature/purge-compiler-flags
182
182
ecmwf/eccodes
183
183
ecmwf/fckit@refs/tags/0.13.0
184
184
ecmwf-ifs/fiat@refs/tags/1.4.1
Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ if( NOT ECWAM_PROJECT_NAME )
20
20
endif ()
21
21
22
22
string ( TOUPPER ${ECWAM_PROJECT_NAME} PNAME )
23
- set ( ${PNAME} _ECBUILD_COMPILE_FLAGS ${CMAKE_CURRENT_SOURCE_DIR} /cmake/ecwam_init_flags.cmake CACHE FILEPATH "" )
24
23
project ( ${ECWAM_PROJECT_NAME} LANGUAGES Fortran C CXX )
25
24
26
25
include ( ecwam_macros )
Original file line number Diff line number Diff line change 6
6
# granted to it by virtue of its status as an intergovernmental organisation
7
7
# nor does it submit to any jurisdiction.
8
8
9
- # Capture ecbuild defaults and/or flags set by a toolchain
10
- set ( ${PNAME} _Fortran_FLAGS "${${PNAME} _Fortran_FLAGS} ${ECBUILD_Fortran_FLAGS} " )
11
- set ( ${PNAME} _Fortran_FLAGS_BIT "${${PNAME} _Fortran_FLAGS_BIT} ${ECBUILD_Fortran_FLAGS_BIT} " )
12
- set ( ${PNAME} _Fortran_FLAGS_DEBUG "${${PNAME} _Fortran_FLAGS_DEBUG} ${ECBUILD_Fortran_FLAGS_DEBUG} " )
9
+ # Trigger the use of <PNAME>_LANG_FLAGS in ecbuild
10
+ ecbuild_init_overrideable_compiler_flags(
11
+ LANGUAGES Fortran
12
+ CAPTURE_BUNDLE_FLAGS
13
+ COMPILE_FLAGS ${CMAKE_CURRENT_SOURCE_DIR} /cmake/ecwam_compile_flags.cmake
14
+ )
13
15
14
16
if (CMAKE_Fortran_COMPILER_ID MATCHES "Cray" )
15
17
set (autopromote_flags "-sreal64" )
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -13,8 +13,8 @@ cmake : CMAKE_LINK_DEPENDS_NO_SHARED=ON
13
13
projects :
14
14
15
15
- ecbuild :
16
- git : https://github.com/ecmwf /ecbuild
17
- version : master
16
+ git : https://github.com/awnawab /ecbuild.git
17
+ version : feature/purge-compiler-flags
18
18
bundle : false
19
19
20
20
- eccodes :
You can’t perform that action at this time.
0 commit comments