From 4a335f884e9580bf6b42c6d1ea7d206372dc8de6 Mon Sep 17 00:00:00 2001 From: Nick Szapiro Date: Thu, 17 Oct 2024 18:18:25 +0000 Subject: [PATCH] No need to add_dependencies(cdeps) --- CICE-interface/CMakeLists.txt | 2 +- CICE-interface/cice_files.cmake | 2 +- CMEPS-interface/CMakeLists.txt | 5 ++--- MOM6-interface/CMakeLists.txt | 4 ---- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CICE-interface/CMakeLists.txt b/CICE-interface/CMakeLists.txt index b027e1d3e2..c64f8bcc2d 100644 --- 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 index 3d20c8399e..9ef56bcef8 100644 --- 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 index 7f1d463aa7..89a815bd22 100644 --- 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 index ed2d1e8a6c..57f9f7b8c9 100644 --- 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 ###############################################################################