Skip to content

Commit

Permalink
Merge pull request #291 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mathomp4 authored Jan 6, 2025
2 parents 4f6c0a9 + bc542b6 commit 3405efa
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion CMakeLists.txt
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

0 comments on commit 3405efa

Please sign in to comment.