Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation with cce 17.0.1 #37

Open
wants to merge 1 commit into
base: hotfix/2.1.11
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/multio/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ ecbuild_add_executable( TARGET multio-feed
SOURCES multio-feed.cc MultioTool.cc
LIBS multio-api )

# TODO ADD SOME FCKIT condition
ecbuild_add_executable( TARGET multio-replay-nemo-fapi
CONDITION HAVE_FORTRAN
SOURCES multio-replay-nemo-fapi.f90
LIBS multio-fapi fckit MPI::MPI_Fortran )
ecbuild_find_mpi(COMPONENTS Fortran)
if( HAVE_MPI AND TARGET MPI::MPI_Fortran )
# TODO ADD SOME FCKIT condition
ecbuild_add_executable( TARGET multio-replay-nemo-fapi
CONDITION HAVE_FORTRAN
SOURCES multio-replay-nemo-fapi.f90
LIBS multio-fapi fckit MPI::MPI_Fortran )
endif()

# TODO: add atlas condition/dependency
ecbuild_add_executable( TARGET multio-generate-grib-template
Expand Down
19 changes: 11 additions & 8 deletions tests/multio/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,17 @@ ecbuild_add_test( TARGET test_multio_replay_nemo_capi_initdefault_passdown
ENVIRONMENT "${_test_environment}"
)

ecbuild_add_test( TARGET test_multio_replay_nemo_fapi
CONDITION HAVE_FORTRAN
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/replay-nemo.sh
TEST_DEPENDS multio_replay_get_test_data
ARGS $<TARGET_FILE:multio-replay-nemo-fapi>
$<TARGET_FILE:multio-probe> ${MPIEXEC_EXECUTABLE} ${MPI_ARGS}
ENVIRONMENT "${_test_environment}"
)
ecbuild_find_mpi(COMPONENTS Fortran)
if( HAVE_MPI AND TARGET MPI::MPI_Fortran )
ecbuild_add_test( TARGET test_multio_replay_nemo_fapi
CONDITION HAVE_FORTRAN
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/replay-nemo.sh
TEST_DEPENDS multio_replay_get_test_data
ARGS $<TARGET_FILE:multio-replay-nemo-fapi>
$<TARGET_FILE:multio-probe> ${MPIEXEC_EXECUTABLE} ${MPI_ARGS}
ENVIRONMENT "${_test_environment}"
)
endif()

ecbuild_add_test( TARGET test_multio_replay_nemo_capi_masked
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/replay-nemo.sh
Expand Down