From dd341a3ce9302e01877eaec59e807d79396d624c Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Tue, 23 Apr 2024 14:42:05 -0400
Subject: [PATCH] Remove macOS + Intel CMake logic

---
 CHANGELOG.md             |  2 ++
 MAPL_cfio/CMakeLists.txt | 17 +----------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd2104994c4d..4b95555ef412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Removed CMake logic for macOS + Intel as that is an unsupported configuration
+
 ### Deprecated
 
 ## [2.44.3] - 2024-03-28
diff --git a/MAPL_cfio/CMakeLists.txt b/MAPL_cfio/CMakeLists.txt
index 01ccb4b5e8c2..16d5f4b931c3 100644
--- a/MAPL_cfio/CMakeLists.txt
+++ b/MAPL_cfio/CMakeLists.txt
@@ -27,25 +27,10 @@ set (EOS )
 
 set (lib MAPL_cfio_${precision})
 
-if (APPLE AND CMAKE_Fortran_COMPILER_ID MATCHES Intel AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 20.2.1)
-   set (LIBRARY_TYPE STATIC)
-   ecbuild_warn (
-      "Found Intel oneAPI on macOS.\n"
-      "MAPL developers have found an issue with Intel oneAPI on macOS\n"
-      "where GEOSgcm.x would not work. Debugging found the issue was\n"
-      "that command_argument_count() would return -1 which should *NEVER*\n"
-      "happen per Fortran Standard and then this broke FLAP.\n"
-      "A workaround was found that if the ${this} library was compiled\n"
-      "as TYPE STATIC, the model would work. So we are setting ${this} as\n"
-      "a TYPE STATIC library. Note: This might interfere with coupled model.")
-else ()
-   set (LIBRARY_TYPE ${MAPL_LIBRARY_TYPE})
-endif ()
-
 esma_add_library (${lib}
   SRCS ${srcs}
   DEPENDENCIES ESMF::ESMF NetCDF::NetCDF_Fortran
-  TYPE ${LIBRARY_TYPE}
+  TYPE ${MAPL_LIBRARY_TYPE}
   )
 
 if (precision MATCHES "r8")