zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-13 11:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix linkage of openMP for XCode 12.5 (#919)

Browse source
This commit is contained in:
Tom M 2021-06-22 09:23:19 +02:00 committed by GitHub
parent 15bd824af0
commit 95e3693779
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.azure/azure-pipelines-mac.yml
View file

@ -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: |

7
CMakeLists.txt
View file

@ -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()