No need to add_dependencies(cdeps)

NickSzapiro-NOAA · Oct 17, 2024 · 4a335f8 · 4a335f8
1 parent ae98062
commit 4a335f8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/CICE-interface/CMakeLists.txt b/CICE-interface/CMakeLists.txt
@@ -63,7 +63,7 @@ list(APPEND lib_src_files
   ${icepack_files}
   ${cice_mpi_comm_files}
   ${cice_nuopc_cmeps_driver_files}
-  ${cice_cdeps_inline_files})
+  ${cice_cdeps_share_files})
 
 list(APPEND _cice_defs FORTRANUNDERSCORE
                        coupled)

diff --git a/CICE-interface/cice_files.cmake b/CICE-interface/cice_files.cmake
@@ -151,7 +151,7 @@ list(APPEND cice_nuopc_cmeps_driver_files
   CICE/cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
 )
 
-list(APPEND cice_cdeps_inline_files
+list(APPEND cice_cdeps_share_files
   #-- Using ice prescribed ifndef cesmcoupled
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_orb_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_const_mod.F90

diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -43,7 +43,6 @@ list(APPEND _ufs_util_files
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_kind_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_assert_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_infnan_mod.F90
-  ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/streams/dshr_methods_mod.F90
   ${PROJECT_SOURCE_DIR}/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90)
 
 list(APPEND _mediator_files
@@ -192,10 +191,10 @@ if(OpenMP_Fortran_FOUND)
 endif()
 
 ### Set dependency for CDEPS if inline capability is requested
-#if(CDEPS_INLINE)
+if(CDEPS_INLINE)
   add_dependencies(cmeps cdeps::cdeps)
   target_link_libraries(cmeps PUBLIC cdeps::cdeps)
-#endif()
+endif()
 
 ###############################################################################
 ### Install

diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
@@ -108,10 +108,6 @@ if(MOM6SOLO)
   #endif()
 endif()
 
-add_dependencies(mom6 cdeps::cdeps)
-target_compile_definitions(mom6 PUBLIC "DISABLE_FoX")
-target_link_libraries(mom6 PUBLIC cdeps::cdeps)
-
 ###############################################################################
 ### Install
 ###############################################################################