merge from trunk r37405
authorXiao Xiangquan <xiaoxiangquan@gmail.com>
Sat, 11 Jun 2011 12:48:13 +0000 (12:48 +0000)
committerXiao Xiangquan <xiaoxiangquan@gmail.com>
Sat, 11 Jun 2011 12:48:13 +0000 (12:48 +0000)
1  2 
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt
source/creator/creator.c

@@@ -5,14 -5,29 +5,25 @@@
  # use it instead of include_directories()
  macro(blender_include_dirs
        includes)
-       foreach(inc ${ARGV})
-               get_filename_component(abs_inc ${inc} ABSOLUTE)
-               list(APPEND all_incs ${abs_inc})
+       set(_ALL_INCS "")
+       foreach(_INC ${ARGV})
+               get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+               list(APPEND _ALL_INCS ${_ABS_INC})
        endforeach()
-       include_directories(${all_incs})
+       include_directories(${_ALL_INCS})
+       unset(_INC)
+       unset(_ABS_INC)
+       unset(_ALL_INCS)
  endmacro()
  
 -macro(blender_include_dirs_sys
 -      includes)
+       set(_ALL_INCS "")
+       foreach(_INC ${ARGV})
+               get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+               list(APPEND _ALL_INCS ${_ABS_INC})
 -      endforeach()
+       include_directories(SYSTEM ${_ALL_INCS})
+       unset(_INC)
+       unset(_ABS_INC)
+       unset(_ALL_INCS)
 -endmacro()
  
  macro(blender_source_group
        sources)
Simple merge
Simple merge