From 1ccbced8b3e2dccd35be640d4544187fd984423f Mon Sep 17 00:00:00 2001
From: Dan Smith <dan.smith@maxar.com>
Date: Thu, 28 Dec 2023 14:51:52 -0500
Subject: [PATCH] latest from CODA-OSS

---
 externals/coda-oss/cmake/CodaBuild.cmake           | 14 +++++++++-----
 .../c++/hdf5.lite/include/hdf5/lite/highfive.h     |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/externals/coda-oss/cmake/CodaBuild.cmake b/externals/coda-oss/cmake/CodaBuild.cmake
index c4c859da6..a74502f3c 100644
--- a/externals/coda-oss/cmake/CodaBuild.cmake
+++ b/externals/coda-oss/cmake/CodaBuild.cmake
@@ -147,11 +147,15 @@ macro(coda_initialize_build)
     set(CMAKE_CXX_EXTENSIONS OFF)
 
     # Turn on AVX2 by default ... it's from 2013.
-    if (NOT ENABLE_AVX512F)
-        if (NOT DISABLE_AVX2)
-            set(ENABLE_AVX2 true)
-        endif()
-    endif()
+    # Well, no :-( ... it seems to cause crashes w/older
+    # compilers on build servers. :-(
+    set(ENABLE_AVX2 false)
+    set(ENABLE_AVX512F false)
+    #if (NOT ENABLE_AVX512F)
+    #    if (NOT DISABLE_AVX2)
+    #        set(ENABLE_AVX2 true)
+    #    endif()
+    #endif()
 
     # MSVC-specific flags and options.
     if (MSVC)
diff --git a/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h b/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h
index d5d91987b..c93d5a9a4 100644
--- a/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h
+++ b/externals/coda-oss/modules/c++/hdf5.lite/include/hdf5/lite/highfive.h
@@ -33,6 +33,8 @@
 #include <stdexcept>
 #include <vector>
 
+#include "types/RowCol.h"
+
 #include "H5_.h"
 #include "SpanRC.h"