Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto PR - develop → MAPL-v3 - v11: Add dependency to fms_r4 #290

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Auto PR - develop → MAPL-v3 - v11: Add dependency to fms_r4 #290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f21465a
v11: Add dependency to fms_r4
mathomp4 Dec 10, 2024
bc542b6
Merge pull request #289 from GEOS-ESM/bugfix/mathomp4/v11-fms-depend
mathomp4 Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (BUILD_GEOS_GTFV3_INTERFACE)
message(STATUS "Building GEOS-gtFV3 interface")

add_definitions(-DRUN_GTFV3)

# The Python library creation requires mpiexec/mpirun to run on a
# compute node. Probably a weird SLURM thing?
find_package(MPI REQUIRED)
Expand Down Expand Up @@ -124,6 +124,12 @@ endif ()
if (FV_PRECISION STREQUAL R4)
set (GFDL fms_r4)
elseif (FV_PRECISION STREQUAL R4R8) # FV is R4 but FMS is R8
# We need to add_dependencies for fms_r4 because CMake doesn't know we
# need it for include purposes. In R4R8, we only ever link against
# fms_r4, so it doesn't know we need to build it.
# NOTE NOTE NOTE: This should *not* be included in GEOSgcm v12
# because FMS is pre-built library in that case.
add_dependencies (${this} fms_r4)
get_target_property (extra_incs fms_r4 INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(${this} PRIVATE
$<BUILD_INTERFACE:${extra_incs}>
Expand Down
Loading