From 8d2364e51d9dc4cefbf686f394ccacececd1c985 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Wed, 24 Mar 2021 22:08:58 +0100
Subject: [PATCH] Update dependencies
Following update of libraries: NetCDF-Fortran is private in NetCDF95
and MPI-Fortran is private in EZMPI.
---
Inst_eddies/CMakeLists.txt | 3 ++-
Inst_eddies/Tests/CMakeLists.txt | 19 +++++++++++--------
Overlap/CMakeLists.txt | 2 +-
Overlap/Tests/CMakeLists.txt | 17 ++++++++++-------
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/Inst_eddies/CMakeLists.txt b/Inst_eddies/CMakeLists.txt
index 6a622f26..0efc8dd4 100644
--- a/Inst_eddies/CMakeLists.txt
+++ b/Inst_eddies/CMakeLists.txt
@@ -10,6 +10,7 @@ add_executable(inst_eddies inst_eddies.f90
target_include_directories(inst_eddies PRIVATE ${fortrangis_INCLUDE_DIR})
target_link_libraries(inst_eddies PRIVATE contour_531 geometry
- NetCDF95::netcdf95 shapelib_03 numer_rec_95 nr_util jumble)
+ NetCDF95::netcdf95 shapelib_03 numer_rec_95 nr_util jumble
+ NetCDF_Fortran::NetCDF_Fortran)
include(Tests/CMakeLists.txt)
diff --git a/Inst_eddies/Tests/CMakeLists.txt b/Inst_eddies/Tests/CMakeLists.txt
index 342136ca..ea725907 100644
--- a/Inst_eddies/Tests/CMakeLists.txt
+++ b/Inst_eddies/Tests/CMakeLists.txt
@@ -6,7 +6,7 @@ add_executable(test_get_1_outerm good_contour.f90
${CMAKE_CURRENT_LIST_DIR}/test_get_1_outerm.f90)
target_link_libraries(test_get_1_outerm geometry NetCDF95::netcdf95 shapelib_03
- contour_531 nr_util jumble)
+ contour_531 nr_util jumble NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_get_1_outerm PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -20,7 +20,8 @@ add_executable(test_set_all_outerm
get_var.f90 ${CMAKE_CURRENT_LIST_DIR}/test_set_all_outerm.f90)
target_link_libraries(test_set_all_outerm geometry NetCDF95::netcdf95
- numer_rec_95 shapelib_03 contour_531 jumble nr_util)
+ numer_rec_95 shapelib_03 contour_531 jumble nr_util
+ NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_set_all_outerm PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -31,7 +32,7 @@ add_executable(test_good_contour good_contour.f90
${CMAKE_CURRENT_LIST_DIR}/test_good_contour.f90)
target_link_libraries(test_good_contour geometry NetCDF95::netcdf95 shapelib_03
- contour_531 jumble nr_util)
+ contour_531 jumble nr_util NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_good_contour PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -50,7 +51,7 @@ add_executable(test_mean_speed mean_speed.f90
${CMAKE_CURRENT_LIST_DIR}/test_mean_speed.f90)
target_link_libraries(test_mean_speed numer_rec_95 NetCDF95::netcdf95
- shapelib_03 contour_531 nr_util)
+ shapelib_03 contour_531 nr_util NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_mean_speed PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -63,7 +64,7 @@ add_executable(test_max_speed_contour_ssh
${CMAKE_CURRENT_LIST_DIR}/test_max_speed_contour_ssh.f90)
target_link_libraries(test_max_speed_contour_ssh NetCDF95::netcdf95 contour_531
- jumble nr_util)
+ jumble nr_util NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_max_speed_contour_ssh PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -75,7 +76,7 @@ add_executable(test_nearby_extr nearby_extr.f90
${CMAKE_CURRENT_LIST_DIR}/test_nearby_extr.f90)
target_link_libraries(test_nearby_extr NetCDF95::netcdf95 shapelib_03
- contour_531 jumble nr_util)
+ contour_531 jumble nr_util NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_nearby_extr PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -86,7 +87,8 @@ add_executable(test_local_extrema local_extrema.f90
${CMAKE_CURRENT_LIST_DIR}/test_local_extrema.f90
${CMAKE_SOURCE_DIR}/Tests/write_extr_map.f90)
-target_link_libraries(test_local_extrema NetCDF95::netcdf95 nr_util jumble)
+target_link_libraries(test_local_extrema NetCDF95::netcdf95 nr_util
+ jumble NetCDF_Fortran::NetCDF_Fortran)
# test_set_max_speed
@@ -97,7 +99,8 @@ add_executable(test_set_max_speed
${CMAKE_CURRENT_LIST_DIR}/test_set_max_speed.f90)
target_link_libraries(test_set_max_speed geometry numer_rec_95
- NetCDF95::netcdf95 shapelib_03 contour_531 jumble nr_util)
+ NetCDF95::netcdf95 shapelib_03 contour_531 jumble nr_util
+ NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_set_max_speed PRIVATE ${fortrangis_INCLUDE_DIR})
diff --git a/Overlap/CMakeLists.txt b/Overlap/CMakeLists.txt
index e3569b1e..730bac06 100644
--- a/Overlap/CMakeLists.txt
+++ b/Overlap/CMakeLists.txt
@@ -15,7 +15,7 @@ add_executable(eddy_graph eddy_graph.f90 shp_tr_open.f90
target_include_directories(eddy_graph PRIVATE ${fortrangis_INCLUDE_DIR})
target_link_libraries(eddy_graph PRIVATE ezmpi jumble shapelib_03
- contour_531 gpc_f geometry nr_util)
+ contour_531 gpc_f geometry nr_util MPI::MPI_Fortran)
configure_file(eddy_graph_in.sh eddy_graph.sh @ONLY)
execute_process(COMMAND chmod -w ${CMAKE_CURRENT_BINARY_DIR}/eddy_graph.sh)
diff --git a/Overlap/Tests/CMakeLists.txt b/Overlap/Tests/CMakeLists.txt
index fcf04a68..50c87d91 100644
--- a/Overlap/Tests/CMakeLists.txt
+++ b/Overlap/Tests/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(test_overlap ${CMAKE_SOURCE_DIR}/derived_types.f90
${CMAKE_SOURCE_DIR}/shp_tr_close.f90 unit_edge_m.f90 write_edge.f90)
target_link_libraries(test_overlap shapelib_03 geometry contour_531
- gpc_f ezmpi nr_util jumble)
+ gpc_f ezmpi nr_util jumble MPI::MPI_Fortran)
target_include_directories(test_overlap PRIVATE ${fortrangis_INCLUDE_DIR})
@@ -26,8 +26,9 @@ add_executable(test_read_snapshot
${CMAKE_CURRENT_LIST_DIR}/write_snapshot.f90 shp_tr_open.f90
${CMAKE_SOURCE_DIR}/shp_tr_close.f90)
-target_link_libraries(test_read_snapshot NetCDF95::netcdf95 shapelib_03
- contour_531 gpc_f ezmpi nr_util jumble)
+target_link_libraries(test_read_snapshot NetCDF95::netcdf95
+ shapelib_03 contour_531 gpc_f ezmpi nr_util jumble
+ NetCDF_Fortran::NetCDF_Fortran MPI::MPI_Fortran)
target_include_directories(test_read_snapshot PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -61,7 +62,7 @@ add_executable(test_read_eddy ${CMAKE_SOURCE_DIR}/derived_types.f90
${CMAKE_SOURCE_DIR}/shp_tr_close.f90)
target_link_libraries(test_read_eddy shapelib_03 contour_531 gpc_f
- ezmpi nr_util)
+ ezmpi nr_util MPI::MPI_Fortran)
target_include_directories(test_read_eddy PRIVATE ${fortrangis_INCLUDE_DIR})
@@ -92,7 +93,8 @@ add_executable(test_send_recv
${CMAKE_SOURCE_DIR}/shp_tr_close.f90)
target_link_libraries(test_send_recv PRIVATE MPI::MPI_Fortran
- shapelib_03 ezmpi nr_util contour_531 gpc_f NetCDF95::netcdf95 jumble)
+ shapelib_03 ezmpi nr_util contour_531 gpc_f NetCDF95::netcdf95
+ jumble NetCDF_Fortran::NetCDF_Fortran)
target_include_directories(test_send_recv PRIVATE
${fortrangis_INCLUDE_DIR})
@@ -109,8 +111,9 @@ add_executable(test_get_dispatch_snap
send_snapshot.f90 ${CMAKE_SOURCE_DIR}/derived_types.f90
shp_tr_open.f90 ${CMAKE_SOURCE_DIR}/shp_tr_close.f90)
-target_link_libraries(test_get_dispatch_snap shapelib_03 jumble contour_531
- ezmpi NetCDF95::netcdf95 gpc_f nr_util)
+target_link_libraries(test_get_dispatch_snap shapelib_03 jumble
+ contour_531 ezmpi NetCDF95::netcdf95 gpc_f nr_util
+ NetCDF_Fortran::NetCDF_Fortran MPI::MPI_Fortran)
target_include_directories(test_get_dispatch_snap PRIVATE
${fortrangis_INCLUDE_DIR})
--
GitLab