From ce37400c0b6b35acaecec91e9c80901cb8bd7546 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 11 Mar 2014 15:56:34 +0100 Subject: OSX/cmake: tentative fix for T38746, conflictting flags somewhere --- extern/bullet2/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'extern/bullet2/CMakeLists.txt') diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 2b2c18c0685..7129223e5d2 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}") -- cgit v1.2.3