Rework the dependency linking of hydro CMake compilation (#2178)

islas · web-flow · commit 2e0694f1450d · 2025-04-22T13:58:20.000-07:00
TYPE: bug fix

KEYWORDS: cmake, hydro

SOURCE: internal

DESCRIPTION OF CHANGES:
Problem:
Some dependencies were not being fully satisfied and were implicit /
partially fulfilled by subsequent compilation. In compilers that could
tolerate these situations the hydro folder would compile successfully.

However, for compilers where dependencies are enforced (i.e. symbols
resloved at compile time even within Fortran submodules), compilation
would fail.

Solution:
To account for situations where compilers require all module
dependencies be resolved, dependencies between the hydro libraries and
the transitive link properties were reworked to propagate dependencies
up the chain correctly.

TESTS CONDUCTED: 
1. Tested building hydro with Intel oneAPI ifx 2024.2.1

RELEASE NOTE: 
Fixed failed compilation with Intel oneAPI by reworking the dependency
linking of hydro CMake compilation
diff --git a/hydro/CPL/WRF_cpl/CMakeLists.txt b/hydro/CPL/WRF_cpl/CMakeLists.txt
@@ -14,6 +14,8 @@ add_dependencies(hydro_wrf_cpl
         MPI::MPI_Fortran
 )
 
+target_link_libraries( hydro_wrf_cpl PRIVATE hydro_driver )
+
 target_include_directories(hydro_wrf_cpl
         PRIVATE
         $<TARGET_PROPERTY:${PROJECT_NAME}_Core,Fortran_MODULE_DIRECTORY>
diff --git a/hydro/Data_Rec/CMakeLists.txt b/hydro/Data_Rec/CMakeLists.txt
@@ -5,3 +5,4 @@ add_library(hydro_data_rec STATIC
         module_RT_data.F90
         module_namelist.F90
 )
+target_link_libraries( hydro_data_rec PRIVATE hydro_mpp )
diff --git a/hydro/Debug_Utilities/CMakeLists.txt b/hydro/Debug_Utilities/CMakeLists.txt
@@ -2,3 +2,4 @@
 add_library(hydro_debug_utils STATIC
         debug_dump_variable.F90
 )
+target_link_libraries( hydro_debug_utils PRIVATE hydro_mpp )
diff --git a/hydro/HYDRO_drv/CMakeLists.txt b/hydro/HYDRO_drv/CMakeLists.txt
@@ -8,8 +8,7 @@ target_link_libraries(hydro_driver PUBLIC
         hydro_data_rec
         hydro_routing
         hydro_debug_utils
-        PRIVATE
-          netCDF::netcdff
+        netCDF::netcdff
 )
 
 if(WRF_HYDRO_NUDGING STREQUAL "1")
diff --git a/hydro/IO/CMakeLists.txt b/hydro/IO/CMakeLists.txt
@@ -4,6 +4,7 @@ add_library(hydro_netcdf_layer STATIC
 )
 
 target_link_libraries(hydro_netcdf_layer
+        PUBLIC
         MPI::MPI_Fortran
         netCDF::netcdff
 )
diff --git a/hydro/MPP/CMakeLists.txt b/hydro/MPP/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(hydro_mpp STATIC
         hashtable.F90
 )
 
-target_link_libraries(hydro_mpp MPI::MPI_Fortran)
+target_link_libraries(hydro_mpp PUBLIC MPI::MPI_Fortran)
 target_include_directories(hydro_mpp PUBLIC
         ${MPI_Fortran_MODULE_DIR}
 )
diff --git a/hydro/Routing/CMakeLists.txt b/hydro/Routing/CMakeLists.txt
@@ -18,6 +18,7 @@ add_library(hydro_routing STATIC
 )
 
 target_link_libraries(hydro_routing
+       PRIVATE
        MPI::MPI_Fortran
        netCDF::netcdff
        hydro_mpp
diff --git a/hydro/utils/CMakeLists.txt b/hydro/utils/CMakeLists.txt
@@ -18,3 +18,4 @@ add_library(hydro_utils STATIC
         module_version.F90
         module_hydro_stop.F90
 )
+target_link_libraries(hydro_utils PRIVATE MPI::MPI_Fortran)

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ add_dependencies(hydro_wrf_cpl`
`14`	`14`	`MPI::MPI_Fortran`
`15`	`15`	`)`
`16`	`16`
	`17`	`+target_link_libraries( hydro_wrf_cpl PRIVATE hydro_driver )`
	`18`	`+`
`17`	`19`	`target_include_directories(hydro_wrf_cpl`
`18`	`20`	`PRIVATE`
`19`	`21`	`$<TARGET_PROPERTY:${PROJECT_NAME}_Core,Fortran_MODULE_DIRECTORY>`
Original file line number	Diff line number	Diff line change
`@@ -5,3 +5,4 @@ add_library(hydro_data_rec STATIC`
`5`	`5`	`module_RT_data.F90`
`6`	`6`	`module_namelist.F90`
`7`	`7`	`)`
	`8`	`+target_link_libraries( hydro_data_rec PRIVATE hydro_mpp )`
Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@`
`2`	`2`	`add_library(hydro_debug_utils STATIC`
`3`	`3`	`debug_dump_variable.F90`
`4`	`4`	`)`
	`5`	`+target_link_libraries( hydro_debug_utils PRIVATE hydro_mpp )`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ target_link_libraries(hydro_driver PUBLIC`
`8`	`8`	`hydro_data_rec`
`9`	`9`	`hydro_routing`
`10`	`10`	`hydro_debug_utils`
`11`		`- PRIVATE`
`12`		`- netCDF::netcdff`
	`11`	`+ netCDF::netcdff`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`if(WRF_HYDRO_NUDGING STREQUAL "1")`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ add_library(hydro_netcdf_layer STATIC`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`target_link_libraries(hydro_netcdf_layer`
	`7`	`+ PUBLIC`
`7`	`8`	`MPI::MPI_Fortran`
`8`	`9`	`netCDF::netcdff`
`9`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ add_library(hydro_mpp STATIC`
`6`	`6`	`hashtable.F90`
`7`	`7`	`)`
`8`	`8`
`9`		`-target_link_libraries(hydro_mpp MPI::MPI_Fortran)`
	`9`	`+target_link_libraries(hydro_mpp PUBLIC MPI::MPI_Fortran)`
`10`	`10`	`target_include_directories(hydro_mpp PUBLIC`
`11`	`11`	`${MPI_Fortran_MODULE_DIR}`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ add_library(hydro_routing STATIC`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`target_link_libraries(hydro_routing`
	`21`	`+ PRIVATE`
`21`	`22`	`MPI::MPI_Fortran`
`22`	`23`	`netCDF::netcdff`
`23`	`24`	`hydro_mpp`
Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,4 @@ add_library(hydro_utils STATIC`
`18`	`18`	`module_version.F90`
`19`	`19`	`module_hydro_stop.F90`
`20`	`20`	`)`
	`21`	`+target_link_libraries(hydro_utils PRIVATE MPI::MPI_Fortran)`