diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2009-12-08 12:58:42 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2009-12-08 12:58:42 +0300 |
| commit | 5132b6a173fd88ead0bd7f0dd82bacf8672b3b4a (patch) | |
| tree | ffea70b0e6f6adeb768315b206e342687ef4c83d /intern/elbeem | |
| parent | fccceaa87fb1e883c5d29113dc8b7d33786c8c1e (diff) | |
OSX: Disable parallel openMP for elbeem library until a proper fix is found (currently makes fluid sim crash) (Bug# 20043)
Thx Jens Verwiebe for the investigation!
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/elbeem/SConscript | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index e541d334086..b59554e5709 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -33,9 +33,9 @@ IF(WINDOWS) ADD_DEFINITIONS(-DUSE_MSVC6FIXES) ENDIF(WINDOWS) -IF(WITH_OPENMP) +IF(WITH_OPENMP AND NOT APPLE) ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +ENDIF(WITH_OPENMP AND NOT APPLE) BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}") #, libtype='blender', priority=0 ) diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 0900ab1db5c..ef411d0eb03 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -8,7 +8,8 @@ sources = env.Glob('intern/*.cpp') defs = 'NOGUI ELBEEM_BLENDER=1' if env['WITH_BF_OPENMP']: - defs += ' PARALLEL' + if env['OURPLATFORM'] != 'darwin': + defs += ' PARALLEL' if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): defs += ' USE_MSVC6FIXES' |