Skip to content

Commit

Permalink
Merge pull request NCAR#6 from GEOS-ESM/feature/mathomp4/NCAR#1-renam…
Browse files Browse the repository at this point in the history
…e-fms-library

Fixes NCAR#1. Rename GFDL_fms to fms
  • Loading branch information
bena-nasa authored Oct 1, 2019
2 parents b7d9afd + ecebd85 commit 52ab991
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ set (srcs

if (FV_PRECISION STREQUAL R4)
elseif (FV_PRECISION STREQUAL R4R8) # FV is R4 but FMS is R8
get_target_property (extra_incs GFDL_fms_r4 INCLUDE_DIRECTORIES)
get_target_property (extra_incs fms_r4 INCLUDE_DIRECTORIES)
elseif (FV_PRECISION STREQUAL R8)
endif ()

Expand All @@ -61,12 +61,12 @@ esma_add_library (${this}

if (FV_PRECISION STREQUAL R4)
target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4)
target_link_libraries (${this} PUBLIC GFDL_fms_r4)
target_link_libraries (${this} PUBLIC fms_r4)
elseif (FV_PRECISION STREQUAL R4R8) # FV is R4 but FMS is R8
target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4)
target_link_libraries (${this} PUBLIC GFDL_fms_r8)
target_link_libraries (${this} PUBLIC fms_r8)
elseif (FV_PRECISION STREQUAL R8)
target_link_libraries (${this} PUBLIC GFDL_fms_r8)
target_link_libraries (${this} PUBLIC fms_r8)
string(REPLACE " " ";" tmp ${FREAL8})
foreach(flag ${tmp})
target_compile_options (${this} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${flag}>)
Expand Down

0 comments on commit 52ab991

Please sign in to comment.