merge from trunk r37405
[blender.git] / build_files / cmake / macros.cmake
index 6c6621b74668d7b8b9de8277f501ac0032bdded7..679b64044af409c035f16bc93f9cab48a7b1af7b 100644 (file)
@@ -16,18 +16,14 @@ macro(blender_include_dirs
        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)
@@ -53,15 +49,12 @@ endmacro()
 macro(blender_add_lib_nolist
        name
        sources
-       includes
-       includes_sys)
+       includes)
 
        # message(STATUS "Configuring library ${name}")
 
        # include_directories(${includes})
-       # include_directories(SYSTEM ${includes_sys})
        blender_include_dirs("${includes}")
-       blender_include_dirs_sys("${includes_sys}")
 
        add_library(${name} ${sources})
 
@@ -75,10 +68,9 @@ endmacro()
 macro(blender_add_lib
        name
        sources
-       includes
-       includes_sys)
+       includes)
 
-       blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
+       blender_add_lib_nolist(${name} "${sources}" "${includes}")
 
        set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endmacro()