From 57498667f7f57583b41e6415b60080b898c6976b Mon Sep 17 00:00:00 2001
From: Hans Ekkehard Plesser <hans.ekkehard.plesser@nmbu.no>
Date: Fri, 15 Dec 2023 15:19:41 +0100
Subject: [PATCH 1/2] Properly handle OpenMP linker flags

---
 CMakeLists.txt             | 2 +-
 cmake/ProcessOptions.cmake | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a35a169e51..6be2c202fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -275,13 +275,13 @@ endforeach ()
 set( MODULE_LINK_LIBS
   "-lnest"
   "-lsli"
-  "${OpenMP_CXX_FLAGS}"
   "${LTDL_LIBRARIES}"
   "${READLINE_LIBRARIES}"
   "${GSL_LIBRARIES}"
   "${LIBNEUROSIM_LIBRARIES}"
   "${MUSIC_LIBRARIES}"
   "${MPI_CXX_LIBRARIES}"
+  "${OpenMP_CXX_LIBRARIES}"
   "${SIONLIB_LIBRARIES}"
   "${BOOST_LIBRARIES}" )
 
diff --git a/cmake/ProcessOptions.cmake b/cmake/ProcessOptions.cmake
index e20c3086df..d380d98cef 100644
--- a/cmake/ProcessOptions.cmake
+++ b/cmake/ProcessOptions.cmake
@@ -428,6 +428,7 @@ function( NEST_PROCESS_WITH_OPENMP )
       set( OPENMP_FOUND ON )
       set( OpenMP_C_FLAGS "${with-openmp}" )
       set( OpenMP_CXX_FLAGS "${with-openmp}" )
+      set( OpenMP_CXX_LIBRARIES "${with-openmp}" )
     else ()
       find_package( OpenMP )
     endif ()
@@ -436,6 +437,7 @@ function( NEST_PROCESS_WITH_OPENMP )
       set( OPENMP_FOUND "${OPENMP_FOUND}" PARENT_SCOPE )
       set( OpenMP_C_FLAGS "${OpenMP_C_FLAGS}" PARENT_SCOPE )
       set( OpenMP_CXX_FLAGS "${OpenMP_CXX_FLAGS}" PARENT_SCOPE )
+      set( OpenMP_CXX_LIBRARIES "${OpenMP_CXX_LIBRARIES}" PARENT_SCOPE )
       # set flags
       set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" PARENT_SCOPE )
       set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" PARENT_SCOPE )

From 11cef9d6abe58b9d035a7ea1ae66e77dfa9ed0ed Mon Sep 17 00:00:00 2001
From: Hans Ekkehard Plesser <hans.ekkehard.plesser@nmbu.no>
Date: Tue, 19 Dec 2023 07:18:22 +0100
Subject: [PATCH 2/2] Add OpenMP library info to configure summary

---
 cmake/ConfigureSummary.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/ConfigureSummary.cmake b/cmake/ConfigureSummary.cmake
index 5e1c8a14bf..2e78c6a7df 100644
--- a/cmake/ConfigureSummary.cmake
+++ b/cmake/ConfigureSummary.cmake
@@ -100,6 +100,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
   message( "" )
   if ( OPENMP_FOUND )
     message( "Use threading       : Yes (OpenMP: ${OpenMP_CXX_FLAGS})" )
+    message( "    Libraries       : ${OpenMP_CXX_LIBRARIES}" )
   else ()
     message( "Use threading       : No" )
   endif ()