[Bf-blender-cvs] [877706b] master: Cleanup: Restrict the debug -gline-tables-only to cxx_debug in cycles and spelling

[Jens Verwiebe]

Commit: 877706b8ebbecbbef159c1e04e69219d9fbd72ee
Author: Jens Verwiebe
Date:   Sat Mar 22 11:33:21 2014 +0100
https://developer.blender.org/rB877706b8ebbecbbef159c1e04e69219d9fbd72ee

Cleanup: Restrict the debug -gline-tables-only to cxx_debug in cycles and spelling

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

M	extern/bullet2/src/SConscript
M	intern/cycles/blender/CMakeLists.txt

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

diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript
index 54536ca..58c97f0 100644
--- a/extern/bullet2/src/SConscript
+++ b/extern/bullet2/src/SConscript
@@ -40,9 +40,9 @@ incs = '. BulletCollision BulletDynamics LinearMath BulletSoftBody'
 
 if sys.platform=='darwin':
     if env['C_COMPILER_ID'] == 'clang' and env['CCVERSION'] >= '3.4':
-        # Due some bugs in bullet, clang 3.4 produces wrong code when optimized below -O0
-        # to avoid too much speed penalty compiling whole bullet lib non-optimized,
-        # we build a seperate non-optimized/optimized parts and just link together finally
+        # Due some bugs in bullet, clang 3.4 produces wrong code when optimized > -O0
+        # to avoid too much speed penalty when compiling whole bullet lib non-optimized,
+        # we build seperate non-optimized/optimized parts and just link together finally
         bullet2_src.remove("BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp")
         bullet2_fix_src = env.Glob("BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp")
         env.BlenderLib ( libname = 'extern_fix_bullet2', sources=bullet2_fix_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], cc_compileflags=bt_flags, cxx_compileflags=bt_flags )
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 08599f7..9a60152 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -51,7 +51,7 @@ blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
 
 # avoid link failure with clang 3.4 debug
 if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
-	add_definitions(-gline-tables-only)
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gline-tables-only")
 endif()
 
 add_dependencies(bf_intern_cycles bf_rna)