Skip to content

Commit

Permalink
Merge pull request #73 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history
GitFlow: Merge develop into main for release
  • Loading branch information
mathomp4 authored Jun 24, 2024
2 parents cc9f816 + ba1c313 commit e02093c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion MOM6_GEOSPlug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ esma_add_subdirectories(

esma_add_library (${this}
SRCS ${SRCS}
DEPENDENCIES MAPL fms_r8 mom6
DEPENDENCIES MAPL FMS::fms_r8 mom6
TYPE SHARED
)

Expand Down
2 changes: 1 addition & 1 deletion MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ endforeach ()

esma_add_library (${this}
SRCS ${SRCS}
DEPENDENCIES fms_r8
DEPENDENCIES FMS::fms_r8
INCLUDES
$<BUILD_INTERFACE:${MOM6_path}/config_src/memory/dynamic_nonsymmetric>
# choose above set MOM6_infra interface
Expand Down

0 comments on commit e02093c

Please sign in to comment.