From b9e8ee82b25d51785a6bbd9386a368bc34dd3518 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Mon, 10 Jul 2023 09:47:49 -0400
Subject: [PATCH] fixed utils build

---
 CMakeLists.txt       | 6 +++---
 build.sh             | 2 +-
 utils/CMakeLists.txt | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 259924646..b5d2dbf2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,9 @@ if(BUILD_GDASBUNDLE)
   ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda-internal/MOM6.git" BRANCH main-ecbuild RECURSIVE )
   ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH develop )
 
+  # Build JEDI/DA or other peripherals
+  ecbuild_bundle( PROJECT gdas-utils SOURCE "./utils" )
+
 # Build IODA converters
   option(BUILD_IODA_CONVERTERS "Build IODA Converters" ON)
   if(BUILD_IODA_CONVERTERS)
@@ -106,9 +109,6 @@ if(BUILD_GDASBUNDLE)
   ecbuild_bundle( PROJECT land-imsproc  GIT "https://github.com/NOAA-PSL/land-IMS_proc.git"  TAG 6373819 )
   ecbuild_bundle( PROJECT land-jediincr GIT "https://github.com/NOAA-PSL/land-apply_jedi_incr.git"  TAG 2923344)
 
-  # Build JEDI/DA or other peripherals
-  add_subdirectory(utils)
-
 # ioda, ufo, fv3-jedi, and saber test data
 #---------------------------------
 if(CLONE_JCSDADATA)
diff --git a/build.sh b/build.sh
index 0ca550994..9465cda17 100755
--- a/build.sh
+++ b/build.sh
@@ -114,7 +114,7 @@ set -x
 if [[ $BUILD_JCSDA == 'YES' ]]; then
   make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
 else
-  builddirs="fv3-jedi soca iodaconv land-imsproc land-jediincr"
+  builddirs="fv3-jedi soca iodaconv land-imsproc land-jediincr utils"
   for b in $builddirs; do
     cd $b
     make -j ${BUILD_JOBS:-6} VERBOSE=$BUILD_VERBOSE
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 0630aa122..fa229981b 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,4 +1,6 @@
-find_package( NetCDF REQUIRED COMPONENTS CXX)
+project(gdas-utils LANGUAGES C CXX )
+
+find_package(NetCDF REQUIRED COMPONENTS CXX)
 find_package(oops REQUIRED)
 find_package(atlas REQUIRED)
 find_package(soca REQUIRED)