From 95e36937796ec4374a268e22d035242659aac5eb Mon Sep 17 00:00:00 2001
From: Tom M <tom.mbrt@googlemail.com>
Date: Tue, 22 Jun 2021 09:23:19 +0200
Subject: [PATCH] Fix linkage of openMP for XCode 12.5 (#919)

---
 .azure/azure-pipelines-mac.yml | 2 +-
 CMakeLists.txt                 | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.azure/azure-pipelines-mac.yml b/.azure/azure-pipelines-mac.yml
index d9903239..64a6c666 100644
--- a/.azure/azure-pipelines-mac.yml
+++ b/.azure/azure-pipelines-mac.yml
@@ -22,7 +22,7 @@ jobs:
 #        brew upgrade $PACKAGES
   steps:
     - script: |
-        PACKAGES="glib gobject-introspection libsndfile pkg-config jack dbus-glib pulseaudio portaudio sdl2"
+        PACKAGES="glib gobject-introspection libsndfile pkg-config jack dbus-glib pulseaudio portaudio sdl2 libomp"
         brew install $PACKAGES
       displayName: 'Prerequisites'
     - script: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3a3ab88..bfe7bd12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -705,9 +705,10 @@ if ( OpenMP_FOUND OR OpenMP_C_FOUND )
         set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
         set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
 
-        # currently no need to link against openMP runtime lib(s). If need be, uncomment below.
-        #  set ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}" )
-        #  set ( LIBFLUID_LIBS "${OpenMP_C_LIBRARIES};${LIBFLUID_LIBS}" )
+        # include dir and library link seems to be required for Xcode 12.5 (issue #917)
+        include_directories ( SYSTEM ${OpenMP_C_INCLUDE_DIRS} )
+        set ( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}" )
+        set ( LIBFLUID_LIBS "${OpenMP_C_LIBRARIES};${LIBFLUID_LIBS}" )
         set ( HAVE_OPENMP 1 )
     endif()
 endif()