From 2f34da9e7b69c257a212960028854e170d316d78 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 21 Mar 2022 15:25:45 -0400
Subject: [PATCH] Updates for Spack Support, Round 2

Due to insufficient grepping on my part, some remnants of the
"non-canonical" CMake still remain. Apparently these were not necessary
changes for Spack, but they are changes that unify the CMake style of
GEOS to be more like "correct" CMake.

In this go-around, it is mainly finding `INC_ESMF` which I apparently
forgot to grep for last time (I was focused on NetCDF), and some
non-canonical OpenMP calls.

See https://github.com/GEOS-ESM/GEOSgcm/issues/387 for the meta-issue.
---
 CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bde757..590db7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,9 @@ set (srcs
   TR_GridCompMod.F90
   )
 
-esma_add_library (${this} 
-   SRCS ${srcs} 
-   DEPENDENCIES MAPL GMAO_mpeu Chem_Shared GEOS_Shared
-   INCLUDES ${INC_ESMF})
+esma_add_library (${this}
+   SRCS ${srcs}
+   DEPENDENCIES MAPL GMAO_mpeu Chem_Shared GEOS_Shared esmf)
 
 #esma_generate_gocart_code (${this} -F)