OSX: Disable parallel openMP for elbeem library until a proper fix is found (currentl...
authorDamien Plisson <damien.plisson@yahoo.fr>
Tue, 8 Dec 2009 09:58:42 +0000 (09:58 +0000)
committerDamien Plisson <damien.plisson@yahoo.fr>
Tue, 8 Dec 2009 09:58:42 +0000 (09:58 +0000)
Thx Jens Verwiebe for the investigation!

intern/elbeem/CMakeLists.txt
intern/elbeem/SConscript

index e541d334086aa6ff61f3ca634e21ef34901b7616..b59554e5709c47f057ba9e16655ae2d2b592e8f4 100644 (file)
@@ -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 )
index 0900ab1db5c53a35468bd8ddda297fc6b77ae5ab..ef411d0eb038f1a072145512da5de552a49860b2 100644 (file)
@@ -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'