[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25206] trunk/blender/intern/elbeem: OSX: Disable parallel openMP for elbeem library until a proper fix is found ( currently makes fluid sim crash) (Bug# 20043)

[Damien Plisson]

Revision: 25206
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25206
Author:   damien78
Date:     2009-12-08 10:58:42 +0100 (Tue, 08 Dec 2009)

Log Message:
-----------
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!

Modified Paths:
--------------
    trunk/blender/intern/elbeem/CMakeLists.txt
    trunk/blender/intern/elbeem/SConscript

Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt	2009-12-08 09:40:30 UTC (rev 25205)
+++ trunk/blender/intern/elbeem/CMakeLists.txt	2009-12-08 09:58:42 UTC (rev 25206)
@@ -33,9 +33,9 @@
 		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 )

Modified: trunk/blender/intern/elbeem/SConscript
===================================================================
--- trunk/blender/intern/elbeem/SConscript	2009-12-08 09:40:30 UTC (rev 25205)
+++ trunk/blender/intern/elbeem/SConscript	2009-12-08 09:58:42 UTC (rev 25206)
@@ -8,7 +8,8 @@
 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'