[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37039] trunk/blender/build_files/cmake/ macros.cmake: hrmf, centralizing this function didnt quite work.

Campbell Barton ideasman42 at gmail.com
Tue May 31 11:35:16 CEST 2011


Revision: 37039
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37039
Author:   campbellbarton
Date:     2011-05-31 09:35:15 +0000 (Tue, 31 May 2011)
Log Message:
-----------
hrmf, centralizing this function didnt quite work.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-05-31 09:27:33 UTC (rev 37038)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-05-31 09:35:15 UTC (rev 37039)
@@ -3,36 +3,26 @@
 
 # Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
 # use it instead of include_directories()
+macro(blender_include_dirs
+	includes)
 
-macro(file_list_abs
-	files)
-
-	set(files_abs "")
-
-	foreach(fp ${files})
-		get_filename_component(abs_fp ${fp} ABSOLUTE)
-		list(APPEND files_abs "${abs_fp}")
-		message(STATUS "${abs_fp}")
+	foreach(inc ${ARGV})
+		get_filename_component(abs_inc ${inc} ABSOLUTE)
+		list(APPEND all_incs ${abs_inc})
 	endforeach()
-
-	set(${files} "${files_abs}")
+	include_directories(${all_incs})
 endmacro()
 
-
-macro(blender_include_dirs
-	includes)
-	file_list_abs(includes)
-	include_directories(${includes})
-endmacro()
-
-
 macro(blender_include_dirs_sys
 	includes)
-	file_list_abs(includes)
-	include_directories(SYSTEM ${includes})
+
+	foreach(inc ${ARGV})
+		get_filename_component(abs_inc ${inc} ABSOLUTE)
+		list(APPEND all_incs ${abs_inc})
+	endforeach()
+	include_directories(SYSTEM ${all_incs})
 endmacro()
 
-
 macro(blender_source_group
 	sources)
 




More information about the Bf-blender-cvs mailing list