From a22e517e07b9d7ec25392965513c958d496ea48b Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Mon, 21 Nov 2022 21:42:23 +0100
Subject: [PATCH] Use relative path to Overlap
Use relative path to Overlap from `Inst_eddies/Tests`. For symmetry
with what we do in `Overlap/Tests`. So now the directories Overlap and
`Inst_eddies` can be added from the top-level `CMakeLists.txt` in
either order.
---
Inst_eddies/Tests/CMakeLists.txt | 8 ++++++--
Overlap/CMakeLists.txt | 3 ---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Inst_eddies/Tests/CMakeLists.txt b/Inst_eddies/Tests/CMakeLists.txt
index ff9223de..4640e1f0 100644
--- a/Inst_eddies/Tests/CMakeLists.txt
+++ b/Inst_eddies/Tests/CMakeLists.txt
@@ -36,7 +36,10 @@ target_link_libraries(test_max_speed_contour_ssh PRIVATE
Jumble::jumble NetCDF_Fortran::netcdff)
# test_nearby_extr
-add_executable(test_nearby_extr test_nearby_extr.f90)
+add_executable(test_nearby_extr test_nearby_extr.f90
+ ${PROJECT_SOURCE_DIR}/Overlap/read_grid.F90
+ ${PROJECT_SOURCE_DIR}/Overlap/read_snapshot.f90
+ ${PROJECT_SOURCE_DIR}/Overlap/read_eddy.f90)
target_compile_definitions(test_nearby_extr PRIVATE CPP_SEQUENTIAL)
target_link_libraries(test_nearby_extr PRIVATE Shapelib_03::shapelib_03
Contour_531::contour_531 Jumble::jumble gpc_f Numer_Rec_95::numer_rec_95)
@@ -47,7 +50,8 @@ target_link_libraries(test_local_extrema PRIVATE NetCDF95::netcdf95
Jumble::jumble NetCDF_Fortran::netcdff)
# test_set_max_speed
-add_executable(test_set_max_speed test_set_max_speed.f90)
+add_executable(test_set_max_speed test_set_max_speed.f90
+ ${PROJECT_SOURCE_DIR}/Overlap/read_eddy.f90)
target_link_libraries(test_set_max_speed PRIVATE Geometry::geometry
Numer_Rec_95::numer_rec_95 NetCDF95::netcdf95
Shapelib_03::shapelib_03 Contour_531::contour_531 Jumble::jumble
diff --git a/Overlap/CMakeLists.txt b/Overlap/CMakeLists.txt
index 4e6e3a87..4751624a 100644
--- a/Overlap/CMakeLists.txt
+++ b/Overlap/CMakeLists.txt
@@ -23,9 +23,6 @@ target_sources(test_overlap PRIVATE overlap.f90 spher_polygon_area.f90
candidate_overlap.f90 unit_edge_m.f90 config_graph.F90 read_grid.F90
read_snapshot.f90 read_eddy.f90)
target_sources(test_spher_polygon_area PRIVATE spher_polygon_area.f90)
-target_sources(test_nearby_extr PRIVATE read_grid.F90 read_snapshot.f90
- read_eddy.f90)
-target_sources(test_set_max_speed PRIVATE read_eddy.f90)
target_sources(test_read_snapshot PRIVATE read_snapshot.f90 read_eddy.f90
read_grid.F90 config_graph.F90)
target_sources(test_read_eddy PRIVATE read_eddy.f90)
--
GitLab