Skip to content
Snippets Groups Projects
Commit 57141d9e authored by Lionel GUEZ's avatar Lionel GUEZ
Browse files

Prepend libraries with namespaces 

Following updates of the libraries.
parent c1d01e89
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Inst_eddies/CMakeLists.txt
+ 3
− 3
View file @ 57141d9e
......@@ -10,9 +10,9 @@ add_executable(inst_eddies inst_eddies.f90
write_aux.f90 config.f90 ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90)
target_link_libraries(inst_eddies PRIVATE contour_531 geometry
NetCDF95::netcdf95 shapelib_03 numer_rec_95 nr_util jumble
NetCDF_Fortran::netcdff)
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)
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
+ 20
− 16
View file @ 57141d9e
......@@ -8,8 +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 nr_util jumble NetCDF_Fortran::netcdff)
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)
# test_set_all_outerm
......@@ -23,8 +24,9 @@ add_executable(test_set_all_outerm
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
target_link_libraries(test_set_all_outerm PRIVATE geometry
NetCDF95::netcdf95 numer_rec_95 shapelib_03 contour_531 jumble
nr_util NetCDF_Fortran::netcdff)
NetCDF95::netcdf95 Numer_Rec_95::numer_rec_95 shapelib_03
Contour_531::contour_531 Jumble::jumble NR_util::nr_util
NetCDF_Fortran::netcdff)
# test_good_contour
......@@ -32,23 +34,24 @@ 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 jumble nr_util
NetCDF_Fortran::netcdff)
NetCDF95::netcdf95 shapelib_03 Contour_531::contour_531
Jumble::jumble NR_util::nr_util NetCDF_Fortran::netcdff)
# test_inside_4
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)
target_link_libraries(test_inside_4 geometry shapelib_03 Jumble::jumble)
# test_mean_speed
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 NetCDF_Fortran::netcdff gpc_f jumble)
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)
# test_max_speed_contour_ssh
......@@ -58,7 +61,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 PRIVATE fortranGIS
NetCDF95::netcdf95 contour_531 jumble nr_util
NetCDF95::netcdf95 Contour_531::contour_531 Jumble::jumble NR_util::nr_util
NetCDF_Fortran::netcdff)
# test_nearby_extr
......@@ -72,8 +75,8 @@ 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 contour_531 jumble
nr_util gpc_f)
target_link_libraries(test_nearby_extr shapelib_03
Contour_531::contour_531 Jumble::jumble NR_util::nr_util gpc_f)
# test_local_extrema
......@@ -81,8 +84,8 @@ add_executable(test_local_extrema local_extrema.f90
${CMAKE_CURRENT_LIST_DIR}/test_local_extrema.f90
${PROJECT_SOURCE_DIR}/Tests/write_extr_map.f90)
target_link_libraries(test_local_extrema NetCDF95::netcdf95 nr_util
jumble NetCDF_Fortran::netcdff)
target_link_libraries(test_local_extrema NetCDF95::netcdf95 NR_util::nr_util
Jumble::jumble NetCDF_Fortran::netcdff)
# test_set_max_speed
......@@ -98,6 +101,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
NetCDF95::netcdf95 shapelib_03 contour_531 jumble nr_util
target_link_libraries(test_set_max_speed geometry
Numer_Rec_95::numer_rec_95 NetCDF95::netcdf95 shapelib_03
Contour_531::contour_531 Jumble::jumble NR_util::nr_util
NetCDF_Fortran::netcdff gpc_f)
Overlap/CMakeLists.txt
+ 3
− 2
View file @ 57141d9e
......@@ -14,8 +14,9 @@ add_executable(eddy_graph eddy_graph.f90
${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
${PROJECT_SOURCE_DIR}/Common/derived_types.f90 unit_edge_m.f90)
target_link_libraries(eddy_graph PRIVATE ezmpi jumble shapelib_03
contour_531 gpc_f geometry nr_util MPI::MPI_Fortran)
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)
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
+ 12
− 11
View file @ 57141d9e
......@@ -11,8 +11,8 @@ 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 contour_531
gpc_f nr_util jumble)
target_link_libraries(test_overlap shapelib_03 geometry
Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble)
# test_read_snapshot
......@@ -30,7 +30,7 @@ add_executable(test_read_snapshot
${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
target_link_libraries(test_read_snapshot NetCDF95::netcdf95
shapelib_03 contour_531 gpc_f nr_util jumble
shapelib_03 Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble
NetCDF_Fortran::netcdff)
# test_spher_polygon_area
......@@ -40,7 +40,7 @@ add_executable(test_spher_polygon_area spher_polygon_area.f90
${CMAKE_CURRENT_LIST_DIR}/test_spher_polygon_area.f90)
target_link_libraries(test_spher_polygon_area geometry shapelib_03
jumble gpc_f nr_util)
Jumble::jumble gpc_f NR_util::nr_util)
# test_weight
......@@ -48,7 +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 nr_util)
target_link_libraries(test_weight PRIVATE fortranGIS
Contour_531::contour_531 NR_util::nr_util)
# test_read_eddy
......@@ -62,8 +63,8 @@ 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 contour_531 gpc_f
nr_util jumble)
target_link_libraries(test_read_eddy shapelib_03
Contour_531::contour_531 gpc_f NR_util::nr_util Jumble::jumble)
# test_send_recv
......@@ -81,8 +82,8 @@ 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 contour_531 gpc_f NetCDF95::netcdf95
jumble NetCDF_Fortran::netcdff)
shapelib_03 ezmpi NR_util::nr_util Contour_531::contour_531 gpc_f
NetCDF95::netcdf95 Jumble::jumble NetCDF_Fortran::netcdff)
# test_get_dispatch_snap
......@@ -100,6 +101,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
contour_531 ezmpi NetCDF95::netcdf95 gpc_f nr_util
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)
Tests/CMakeLists.txt
+ 2
− 1
View file @ 57141d9e
......@@ -2,4 +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 contour_531 nr_util)
target_link_libraries(test_spher_polyline_area geometry
Contour_531::contour_531 NR_util::nr_util)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment