diff --git a/CMakeLists.txt b/CMakeLists.txt index dda99d947..661bafc7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # granted to it by virtue of its status as an intergovernmental organisation # nor does it submit to any jurisdiction. -cmake_minimum_required( VERSION 3.12 FATAL_ERROR ) +cmake_minimum_required( VERSION 3.24 FATAL_ERROR ) find_package( ecbuild 3.4 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild ) if( NOT ECWAM_PROJECT_NAME ) diff --git a/README.md b/README.md index 0352d3275..6386fe6c5 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Environment variables $ export MPI_HOME= $ export fiat_ROOT= $ export eccodes_ROOT= - $ export field_api_ROOT= + $ export field_api_ROOT= (if not set, field_api will be cloned) $ export CC= $ export FC= $ export CXX= diff --git a/cmake/ecwam_fetchcontent_field_api.cmake b/cmake/ecwam_fetchcontent_field_api.cmake index 9b2631a6c..6c39d0931 100644 --- a/cmake/ecwam_fetchcontent_field_api.cmake +++ b/cmake/ecwam_fetchcontent_field_api.cmake @@ -20,7 +20,7 @@ if(field_api_FOUND) string(COMPARE EQUAL ${result_var} "-1" clone_field_api) endif() -if( ${clone_field_api} ) +if( clone_field_api ) include(FetchContent) FetchContent_Declare( field_api @@ -30,5 +30,6 @@ if( ${clone_field_api} ) ) set(FIELD_API_ENABLE_TESTS OFF) + set(FIELD_API_ENABLE_ACC OFF) FetchContent_MakeAvailable(field_api) endif() diff --git a/package/bundle/bundle.yml b/package/bundle/bundle.yml index 4832d976d..45d28c580 100644 --- a/package/bundle/bundle.yml +++ b/package/bundle/bundle.yml @@ -30,7 +30,7 @@ projects : options : - - single-precision : + - with-single-precision : help : Enable single precision build of the dwarf cmake : ENABLE_SINGLE_PRECISION=ON