[Bf-blender-cvs] [ce37400] master: OSX/cmake: tentative fix for T38746, conflictting flags somewhere

Jens Verwiebe noreply at git.blender.org
Tue Mar 11 15:57:12 CET 2014


Commit: ce37400c0b6b35acaecec91e9c80901cb8bd7546
Author: Jens Verwiebe
Date:   Tue Mar 11 15:56:34 2014 +0100
https://developer.blender.org/rBce37400c0b6b35acaecec91e9c80901cb8bd7546

OSX/cmake: tentative fix for T38746, conflictting flags somewhere

===================================================================

M	extern/bullet2/CMakeLists.txt

===================================================================

diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index 2b2c18c..7129223 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -403,4 +403,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
+# Tentative fix for bullet misbehavior (T38746), needs further clarification what flags conflict here
+if(APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
+	set(CMAKE_C_FLAGS_RELEASE "") # c-api uses plain basic flags
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3")
+endif()
+
 blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")




More information about the Bf-blender-cvs mailing list