Merge pull request #4089 from GEOS-ESM/develop

Author: mathomp4

.github/actions/ci-build-and-test-mapl/action.yml

@@ -59,4 +59,4 @@ runs:
       run: |
         cmake --build build --target build-tests --parallel 4
         cmake --build build --parallel 4 --target tests
-        ctest --test-dir build --parallel 1 --output-on-failure -L 'ESSENTIAL'
+        ctest --test-dir build --parallel 1 --output-on-failure -L 'ESSENTIAL' || ( echo "Re-running only failing tests..." && ctest --test-dir build --parallel 1 --output-on-failure --rerun-failed )

CHANGELOG.md

@@ -17,6 +17,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.62.0] - 2025-09-25
+
+### Fixed
+
+- CMake workaround for ifx 2025.2
+  - NOTE: Requires ESMA_cmake v3.65.0 for ifx 2025.2 support as well as updates in GFE not yet in Baselibs
+
+### Changed
+
+- Update `components.yaml`
+  - `ESMA_env` v5.14.0
+    - Update to Baselibs 8.19.0
+      - esmf 9.0.0b03
+      - curl 8.16.0
+  - `ESMA_cmake` v3.65.0
+    - Workaround for ifx 2025.2
+
+
 ## [2.61.0] - 2025-09-18
 
 ### Changed

CMakeLists.txt

@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.61.0
+  VERSION 2.62.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui

components.yaml

@@ -5,13 +5,13 @@ MAPL:
 ESMA_env:
   local: ./ESMA_env
   remote: ../ESMA_env.git
-  tag: v5.13.0
+  tag: v5.14.0
   develop: main
 
 ESMA_cmake:
   local: ./ESMA_cmake
   remote: ../ESMA_cmake.git
-  tag: v3.64.0
+  tag: v3.65.0
   develop: develop
 
 ecbuild:

shared/CMakeLists.txt

@@ -41,7 +41,13 @@ target_include_directories (${this} PUBLIC $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/
 
 set_target_properties (${this} PROPERTIES Fortran_MODULE_DIRECTORY ${include_${this}})
 
-target_compile_definitions(${this} PRIVATE SYSTEM_DSO_SUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}")
+# We need to work around a bug in ifx 2025.2 where we have to use a different preprocesor
+# so here we need to escape the double quotes
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 2025.2 AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 2025.3)
+  target_compile_definitions(${this} PRIVATE SYSTEM_DSO_SUFFIX=\\"${CMAKE_SHARED_LIBRARY_SUFFIX}\\")
+else()
+  target_compile_definitions(${this} PRIVATE SYSTEM_DSO_SUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}")
+endif()
 
 if (PFUNIT_FOUND)
   add_subdirectory (tests)