Prepend libraries with namespaces

Following updates of the libraries.

Inst_eddies/CMakeLists.txt

@@ -11,8 +11,9 @@ add_executable(inst_eddies inst_eddies.f90
   ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90)
 
 target_link_libraries(inst_eddies PRIVATE Contour_531::contour_531
-  geometry NetCDF95::netcdf95 shapelib_03 Numer_Rec_95::numer_rec_95
-  NR_util::nr_util Jumble::jumble NetCDF_Fortran::netcdff)
+  Geometry::geometry NetCDF95::netcdf95 Shapelib_03::shapelib_03
+  Numer_Rec_95::numer_rec_95 NR_util::nr_util Jumble::jumble
+  NetCDF_Fortran::netcdff)
 
 configure_file(inst_eddies_in.py inst_eddies.py @ONLY)
 execute_process(COMMAND chmod -w ${CMAKE_CURRENT_BINARY_DIR}/inst_eddies.py)

Inst_eddies/Tests/CMakeLists.txt

@@ -8,9 +8,9 @@ add_executable(test_get_1_outerm good_contour.f90
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
-target_link_libraries(test_get_1_outerm geometry NetCDF95::netcdf95
-  shapelib_03 Contour_531::contour_531 NR_util::nr_util Jumble::jumble
-  NetCDF_Fortran::netcdff)
+target_link_libraries(test_get_1_outerm Geometry::geometry NetCDF95::netcdf95
+  Shapelib_03::shapelib_03 Contour_531::contour_531 NR_util::nr_util
+  Jumble::jumble NetCDF_Fortran::netcdff)
 
 # test_set_all_outerm
 
@@ -23,8 +23,8 @@ add_executable(test_set_all_outerm
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
-target_link_libraries(test_set_all_outerm PRIVATE geometry
-  NetCDF95::netcdf95 Numer_Rec_95::numer_rec_95 shapelib_03
+target_link_libraries(test_set_all_outerm PRIVATE Geometry::geometry
+  NetCDF95::netcdf95 Numer_Rec_95::numer_rec_95 Shapelib_03::shapelib_03
   Contour_531::contour_531 Jumble::jumble NR_util::nr_util
   NetCDF_Fortran::netcdff)
 
@@ -33,8 +33,8 @@ target_link_libraries(test_set_all_outerm PRIVATE geometry
 add_executable(test_good_contour good_contour.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_good_contour.f90)
 
-target_link_libraries(test_good_contour PRIVATE geometry
-  NetCDF95::netcdf95 shapelib_03 Contour_531::contour_531
+target_link_libraries(test_good_contour PRIVATE Geometry::geometry
+  NetCDF95::netcdf95 Shapelib_03::shapelib_03 Contour_531::contour_531
   Jumble::jumble NR_util::nr_util NetCDF_Fortran::netcdff)
 
 # test_inside_4
@@ -42,7 +42,8 @@ target_link_libraries(test_good_contour PRIVATE geometry
 add_executable(test_inside_4 inside_4.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_inside_4.f90)
 
-target_link_libraries(test_inside_4 geometry shapelib_03 Jumble::jumble)
+target_link_libraries(test_inside_4 Geometry::geometry Shapelib_03::shapelib_03
+  Jumble::jumble)
 
 # test_mean_speed
 
@@ -50,8 +51,8 @@ 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::numer_rec_95
-  NetCDF95::netcdf95 shapelib_03 Contour_531::contour_531 NR_util::nr_util
-  NetCDF_Fortran::netcdff gpc_f Jumble::jumble)
+  NetCDF95::netcdf95 Shapelib_03::shapelib_03 Contour_531::contour_531
+  NR_util::nr_util NetCDF_Fortran::netcdff gpc_f Jumble::jumble)
 
 # test_max_speed_contour_ssh
 
@@ -60,9 +61,9 @@ add_executable(test_max_speed_contour_ssh
   get_var.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_max_speed_contour_ssh.f90)
 
-target_link_libraries(test_max_speed_contour_ssh PRIVATE fortranGIS
-  NetCDF95::netcdf95 Contour_531::contour_531 Jumble::jumble NR_util::nr_util
-  NetCDF_Fortran::netcdff)
+target_link_libraries(test_max_speed_contour_ssh PRIVATE
+  fortrangis::fortranGIS NetCDF95::netcdf95 Contour_531::contour_531
+  Jumble::jumble NR_util::nr_util NetCDF_Fortran::netcdff)
 
 # test_nearby_extr
 
@@ -75,7 +76,7 @@ add_executable(test_nearby_extr nearby_extr.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
-target_link_libraries(test_nearby_extr shapelib_03
+target_link_libraries(test_nearby_extr Shapelib_03::shapelib_03
   Contour_531::contour_531 Jumble::jumble NR_util::nr_util gpc_f)
 
 # test_local_extrema
@@ -101,7 +102,7 @@ add_executable(test_set_max_speed
   ${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90)
 
-target_link_libraries(test_set_max_speed geometry
-  Numer_Rec_95::numer_rec_95 NetCDF95::netcdf95 shapelib_03
+target_link_libraries(test_set_max_speed Geometry::geometry
+  Numer_Rec_95::numer_rec_95 NetCDF95::netcdf95 Shapelib_03::shapelib_03
   Contour_531::contour_531 Jumble::jumble NR_util::nr_util
   NetCDF_Fortran::netcdff gpc_f)

Overlap/CMakeLists.txt

@@ -15,8 +15,8 @@ add_executable(eddy_graph eddy_graph.f90
   ${PROJECT_SOURCE_DIR}/Common/derived_types.f90 unit_edge_m.f90)
 
 target_link_libraries(eddy_graph PRIVATE ezmpi Jumble::jumble
-  shapelib_03 Contour_531::contour_531 gpc_f geometry NR_util::nr_util
-  MPI::MPI_Fortran)
+  Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f Geometry::geometry
+  NR_util::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)

Overlap/Tests/CMakeLists.txt

@@ -11,7 +11,7 @@ add_executable(test_overlap
   ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90 unit_edge_m.f90)
 
-target_link_libraries(test_overlap shapelib_03 geometry
+target_link_libraries(test_overlap Shapelib_03::shapelib_03 Geometry::geometry
   Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble)
 
 # test_read_snapshot
@@ -30,8 +30,8 @@ add_executable(test_read_snapshot
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_read_snapshot NetCDF95::netcdf95
-  shapelib_03 Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble
-  NetCDF_Fortran::netcdff)
+  Shapelib_03::shapelib_03 Contour_531::contour_531 gpc_f
+  NR_util::nr_util Jumble::jumble NetCDF_Fortran::netcdff)
 
 # test_spher_polygon_area
 
@@ -39,8 +39,8 @@ add_executable(test_spher_polygon_area spher_polygon_area.f90
   ${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_spher_polygon_area.f90)
 
-target_link_libraries(test_spher_polygon_area geometry shapelib_03
-  Jumble::jumble gpc_f NR_util::nr_util)
+target_link_libraries(test_spher_polygon_area Geometry::geometry
+  Shapelib_03::shapelib_03 Jumble::jumble gpc_f NR_util::nr_util)
 
 # test_weight
 
@@ -48,8 +48,8 @@ add_executable(test_weight weight.f90
   ${PROJECT_SOURCE_DIR}/Common/derived_types.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_weight.f90)
 
-target_link_libraries(test_weight PRIVATE fortranGIS
-Contour_531::contour_531 NR_util::nr_util)
+target_link_libraries(test_weight PRIVATE fortrangis::fortranGIS
+  Contour_531::contour_531 NR_util::nr_util)
   
 # test_read_eddy
 
@@ -63,7 +63,7 @@ add_executable(test_read_eddy
   ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
-target_link_libraries(test_read_eddy shapelib_03
+target_link_libraries(test_read_eddy Shapelib_03::shapelib_03
   Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble)
 
 # test_send_recv
@@ -82,8 +82,9 @@ add_executable(test_send_recv
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_send_recv PRIVATE MPI::MPI_Fortran
-  shapelib_03 ezmpi NR_util::nr_util Contour_531::contour_531 gpc_f
-  NetCDF95::netcdf95 Jumble::jumble NetCDF_Fortran::netcdff)
+  Shapelib_03::shapelib_03 ezmpi NR_util::nr_util
+  Contour_531::contour_531 gpc_f NetCDF95::netcdf95 Jumble::jumble
+  NetCDF_Fortran::netcdff)
 
 # test_get_dispatch_snap
 
@@ -101,6 +102,6 @@ add_executable(test_get_dispatch_snap
   ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
-target_link_libraries(test_get_dispatch_snap shapelib_03 Jumble::jumble
-  Contour_531::contour_531 ezmpi NetCDF95::netcdf95 gpc_f NR_util::nr_util
-  NetCDF_Fortran::netcdff MPI::MPI_Fortran)
+target_link_libraries(test_get_dispatch_snap Shapelib_03::shapelib_03
+  Jumble::jumble Contour_531::contour_531 ezmpi NetCDF95::netcdf95
+  gpc_f NR_util::nr_util NetCDF_Fortran::netcdff MPI::MPI_Fortran)

Tests/CMakeLists.txt

@@ -2,5 +2,5 @@ add_executable(test_spher_polyline_area
   ${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_spher_polyline_area.f90)
 
-target_link_libraries(test_spher_polyline_area geometry
+target_link_libraries(test_spher_polyline_area Geometry::geometry
   Contour_531::contour_531 NR_util::nr_util)