[Bf-blender-cvs] [03d053d] master: Extend workaround to all OS :avoid link failure with clang 3.4 debug
Jens Verwiebe
noreply at git.blender.org
Thu Mar 20 12:39:07 CET 2014
Commit: 03d053da4cf36d17d59434da0d17252411356554
Author: Jens Verwiebe
Date: Thu Mar 20 12:38:45 2014 +0100
https://developer.blender.org/rB03d053da4cf36d17d59434da0d17252411356554
Extend workaround to all OS :avoid link failure with clang 3.4 debug
===================================================================
M intern/cycles/blender/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index ff109da..08599f7 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -49,12 +49,9 @@ add_definitions(-DGLEW_STATIC)
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}")
-if(APPLE)
- # avoid link failure with clang 3.4 debug
- if(${CMAKE_GENERATOR} MATCHES "Xcode" AND ${XCODE_VERSION} VERSION_GREATER 5.0)
- # -gline-tables-only
- set_target_properties(bf_intern_cycles PROPERTIES XCODE_ATTRIBUTE_CLANG_DEBUG_INFORMATION_LEVEL "line-tables-only")
- endif()
+# 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)
endif()
add_dependencies(bf_intern_cycles bf_rna)
More information about the Bf-blender-cvs
mailing list