Skip to content

Commit

Permalink
Merge pull request #9 from ecmwf-ifs/naan-remove-field_api-fetchcontent
Browse files Browse the repository at this point in the history
Remove FIELD_API fetchcontent mechanism
  • Loading branch information
wdeconinck authored Feb 27, 2024
2 parents fcadfe8 + a01fc0b commit 141c5cd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 42 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,12 @@ jobs:
ecmwf/ecbuild
ecmwf/eccodes
ecmwf-ifs/fiat
ecmwf-ifs/field_api@refs/tags/v0.2.2
dependency_branch: develop
dependency_cmake_options: |
ecmwf-ifs/fiat: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTS=OFF"
ecmwf/eccodes: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_MEMFS=ON -DENABLE_JPG=OFF"
ecmwf-ifs/field_api: "-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DENABLE_TESTS=OFF -DENABLE_ACC=OFF"
cmake_options: "-G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ${{ matrix.cmake_options }} -DENABLE_MPI=ON"
ctest_options: "${{ matrix.ctest_options }}"

Expand Down
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ ecbuild_enable_fortran( REQUIRED NO_MODULE_DIRECTORY )

ecbuild_find_package( fiat REQUIRED )
ecbuild_find_package( eccodes REQUIRED )
ecbuild_find_package( field_api REQUIRED )

### Options

Expand Down Expand Up @@ -68,11 +69,6 @@ if( HAVE_ECWAM_LAUNCH )
set( CMAKE_CROSSCOMPILING_EMULATOR ${ECWAM_LAUNCH} ) # For serial runs
endif()

### field_api

include(cmake/ecwam_fetchcontent_field_api.cmake)
ecbuild_find_package( NAME field_api REQUIRED )

### Optional dependencies

ecwam_find_python_mods()
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Environment variables
$ export MPI_HOME=<path-to-MPI>
$ export fiat_ROOT=<path-to-fiat>
$ export eccodes_ROOT=<path-to-eccodes>
$ export field_api_ROOT=<path-to-field_api> (if not set, field_api will be cloned)
$ export field_api_ROOT=<path-to-field_api>
$ export CC=<path-to-C-compiler>
$ export FC=<path-to-Fortran-compiler>
$ export CXX=<path-to-C++-compiler>
Expand Down
35 changes: 0 additions & 35 deletions cmake/ecwam_fetchcontent_field_api.cmake

This file was deleted.

9 changes: 8 additions & 1 deletion package/bundle/bundle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ projects :
git : https://github.com/ecmwf-ifs/fiat
version : main

- field_api :
git : https://github.com/ecmwf-ifs/field_api.git
version : v0.2.2
cmake : >
ENABLE_SINGLE_PRECISION=OFF
ENABLE_ACC=OFF
- ecwam :
dir : $PWD
version : main
Expand All @@ -32,7 +39,7 @@ options :

- with-single-precision :
help : Enable single precision build of the dwarf
cmake : ENABLE_SINGLE_PRECISION=ON
cmake : ENABLE_SINGLE_PRECISION=ON ENABLE_DOUBLE_PRECISION=OFF

- without-mpi :
help : Disable MPI
Expand Down

0 comments on commit 141c5cd

Please sign in to comment.