From a222f230c2c028ed0ed335c13477447869008dca Mon Sep 17 00:00:00 2001
From: Johannes Keller <jo.keller@fz-juelich.de>
Date: Thu, 11 Dec 2025 10:27:34 +0100
Subject: [PATCH 1/2] BuildPDAF: try building PDAF with result variables from
 FindLAPACK

Using

- `LAPACK_LIBRARIES`
- `LAPACK_LINKER_FLAGS`

should make the interface more robust for future compiler changes.
---
 cmake/BuildPDAF.cmake | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/cmake/BuildPDAF.cmake b/cmake/BuildPDAF.cmake
index 50dc58a..05cf0f9 100644
--- a/cmake/BuildPDAF.cmake
+++ b/cmake/BuildPDAF.cmake
@@ -24,7 +24,10 @@ endif()
 # LAPACK is required
 # For eCLM-PDAF, this setting has to be consistent with MKL/LAPACK
 # loading in `eCLM/src/clm5/CMakelists.txt`
+# https://cmake.org/cmake/help/latest/module/FindLAPACK.html
 find_package(LAPACK REQUIRED)
+message(STATUS "LAPACK_LIBRARIES: ${LAPACK_LIBRARIES}")
+message(STATUS "LAPACK_LINKER_FLAGS: ${LAPACK_LINKER_FLAGS}")
 
 # OpenMP is required
 find_package(OpenMP REQUIRED)
@@ -62,21 +65,23 @@ set(PDAF_DIR "${PDAF_SRC}")
 # --------------------------------------
 # --start-group: libraries inside the group are recalled until, such
 # --that order does not matter in the linking command
-list(APPEND PDAF_LINK_LIBS "-Wl,--start-group")
-list(APPEND PDAF_LINK_LIBS "${mkl_intel_ilp64_file}")
-list(APPEND PDAF_LINK_LIBS "${mkl_intel_thread_file}")
-list(APPEND PDAF_LINK_LIBS "${mkl_core_file}")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
-    OR CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
-  list(APPEND PDAF_LINK_LIBS "-qmkl")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  list(APPEND PDAF_LINK_LIBS "-mkl")
-  list(APPEND PDAF_LINK_LIBS "${LAPACK_LIBRARIES}")
-  message(WARNING "LAPACK_LIBRARIES: ${LAPACK_LIBRARIES}")
-else()
-  message(FATAL_ERROR "Unsupported CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
-endif()
-list(APPEND PDAF_LINK_LIBS "-Wl,--end-group")
+list(APPEND PDAF_LINK_LIBS "${LAPACK_LIBRARIES}")
+list(APPEND PDAF_LINK_LIBS "${LAPACK_LINKER_FLAGS}")
+# list(APPEND PDAF_LINK_LIBS "-Wl,--start-group")
+# list(APPEND PDAF_LINK_LIBS "${mkl_intel_ilp64_file}")
+# list(APPEND PDAF_LINK_LIBS "${mkl_intel_thread_file}")
+# list(APPEND PDAF_LINK_LIBS "${mkl_core_file}")
+# if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
+#     OR CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+#   list(APPEND PDAF_LINK_LIBS "-qmkl")
+# elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+#   list(APPEND PDAF_LINK_LIBS "-mkl")
+#   list(APPEND PDAF_LINK_LIBS "${LAPACK_LIBRARIES}")
+#   message(WARNING "LAPACK_LIBRARIES: ${LAPACK_LIBRARIES}")
+# else()
+#   message(FATAL_ERROR "Unsupported CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
+# endif()
+# list(APPEND PDAF_LINK_LIBS "-Wl,--end-group")
 
 # Explicit libraries named in comments should be handed over by the
 # variables. For checking this, search `$BUILD_DIR/CMakeCache.txt`.

From 5cad693a4819e3f2c5a1d548bbc12430a324396b Mon Sep 17 00:00:00 2001
From: Johannes Keller <jo.keller@fz-juelich.de>
Date: Wed, 3 Jun 2026 13:50:42 +0200
Subject: [PATCH 2/2] remove comments

---
 cmake/BuildPDAF.cmake | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/cmake/BuildPDAF.cmake b/cmake/BuildPDAF.cmake
index 6d90d65..a653e44 100644
--- a/cmake/BuildPDAF.cmake
+++ b/cmake/BuildPDAF.cmake
@@ -63,25 +63,8 @@ set(PDAF_DIR "${PDAF_SRC}")
 
 # Set PDAF_LINK_LIBS for Makefile header
 # --------------------------------------
-# --start-group: libraries inside the group are recalled until, such
-# --that order does not matter in the linking command
 list(APPEND PDAF_LINK_LIBS "${LAPACK_LIBRARIES}")
 list(APPEND PDAF_LINK_LIBS "${LAPACK_LINKER_FLAGS}")
-# list(APPEND PDAF_LINK_LIBS "-Wl,--start-group")
-# list(APPEND PDAF_LINK_LIBS "${mkl_intel_ilp64_file}")
-# list(APPEND PDAF_LINK_LIBS "${mkl_intel_thread_file}")
-# list(APPEND PDAF_LINK_LIBS "${mkl_core_file}")
-# if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel"
-#     OR CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
-#   list(APPEND PDAF_LINK_LIBS "-qmkl")
-# elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-#   list(APPEND PDAF_LINK_LIBS "-mkl")
-#   list(APPEND PDAF_LINK_LIBS "${LAPACK_LIBRARIES}")
-#   message(WARNING "LAPACK_LIBRARIES: ${LAPACK_LIBRARIES}")
-# else()
-#   message(FATAL_ERROR "Unsupported CMAKE_CXX_COMPILER_ID: ${CMAKE_CXX_COMPILER_ID}")
-# endif()
-# list(APPEND PDAF_LINK_LIBS "-Wl,--end-group")
 
 # Explicit libraries named in comments should be handed over by the
 # variables. For checking this, search `$BUILD_DIR/CMakeCache.txt`.