Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-03-11 20:33:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-11 20:39:12 +0400
commit6e9ee13de0cc2f7fdd07398e253c52ed41311fdb (patch)
tree2ccb4dc43498c644c39c1cd81414308a5ea7acc7 /extern/bullet2
parentba81fb70b24576a88a38c05eee88d472d6ba10d7 (diff)
CMake: add fastmath for gcc release flags (OSX had already)
Diffstat (limited to 'extern/bullet2')
-rw-r--r--extern/bullet2/CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt
index e8169521599..83580875ccf 100644
--- a/extern/bullet2/CMakeLists.txt
+++ b/extern/bullet2/CMakeLists.txt
@@ -401,12 +401,17 @@ set(SRC
if(CMAKE_COMPILER_IS_GNUCXX)
# needed for gcc 4.6+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math")
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 -ffast-math")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -msse3 -mssse3")
endif()
blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")