Merge pull request NOAA-GFDL#28 from GEOS-ESM/geos/develop

Merge JEDI Cmake change into geos/master

CMakeLists.txt

@@ -48,17 +48,19 @@ set (srcs
   geos_utils/rs_scaleMod.F90
   )
 
+
+esma_add_library (${this}
+  SRCS ${srcs}
+  DEPENDENCIES MAPL gftl-shared
+  INCLUDES ${INC_ESMF})
+
 if (FV_PRECISION STREQUAL R4)
 elseif (FV_PRECISION STREQUAL R4R8) # FV is R4 but FMS is R8
    get_target_property (extra_incs fms_r4 INCLUDE_DIRECTORIES)
+   target_include_directories(${this} PUBLIC ${extra_incs})
 elseif (FV_PRECISION STREQUAL R8)
 endif ()
 
-esma_add_library (${this}
-  SRCS ${srcs}
-  DEPENDENCIES MAPL gftl-shared
-  INCLUDES ${extra_incs} ${INC_ESMF} ${INC_NETCDF})
-
 if (FV_PRECISION STREQUAL R4)
    target_compile_definitions (${this} PRIVATE -DSINGLE_FV -DOVERLOAD_R4)
    target_link_libraries (${this} PUBLIC fms_r4)