Merge pull request NCAR#7 from GEOS-ESM/geos/develop

Merge geos/develop into geos/master

CMakeLists.txt

@@ -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 ()
 
@@ -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}>)